diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index d14ddadc7..29856b886 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -34,10 +34,10 @@
         dataSource: [],
         loading: false,
         approvalResult: {
-          0: this.$t('agree'),
+          0: this.$t('accept'),
           1: this.$t('disagree'),
           2: this.$t('terminationProcess'),
-          3: this.$t('issue')
+          3: this.$t('inquiry')
         },
         columns: [
           {
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index b616e146d..38a70644d 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -517,7 +517,7 @@
               this.$message.success(this.$t('OperationSuccessful'))
             } else {
               this.confirmLoading = false
-              this.$message.warning(this.$t('operationFailed'))
+              this.$message.warning(res.message)
             }
           }
         })
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 68b7dca7e..bcf18f0a6 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -158,7 +158,7 @@
           this.textLoading = this.$t('Submitting')
           this.loading = true
           if (!this.isFlag) {
-            res.flag = 0
+            res.flag = ''
           }
           this.completeTask(res, handlingTime)
         })
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 95a4009af..c7e77282b 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -46,7 +46,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="subtitle">
                 <a-input class="box-input"
-                         :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"
+                         :disabled="formInline.roleCode == 0 ? false : true"
                          v-model="formInline.subtitle"
                          :placeholder="$t('PleaseEnter')+$t('subtitle')"/>
               </a-form-model-item>
@@ -55,86 +55,100 @@
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>
+                <span class="title-text-text"
+                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="wvtaId">
+              <a-form-model-item class="itemModel" prop="applicableSupplement">
                 <a-input class="box-input"
-                         :disabled="false"
-                         v-model="formInline.wvtaId"
-                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('correspondingStandard')">{{$t('correspondingStandard')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'correspondingStandard'">
-                <a-input class="box-input"
-                         :disabled="true"
-                         v-model="formInline.correspondingStandard"
-                         :placeholder="$t('PleaseEnter')+$t('correspondingStandard')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="implementType">
-                <j-dict-select-tag class="box-input" v-model="formInline.implementType"
-                                   :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"
-                                   @input="handleInput('implementType')"
-                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"
-                                   :type="'select'"
-                                   :triggerChange="false" :dictCode="'implement_type'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" :prop="'implementTime'">
-                <a-date-picker class="box-input"
-                               :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               @change="dateChange({db_field_name:'implementTime'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.implementTime"
-                               :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"
-                               style="width: 100%"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>
-              </div>
-              <a-form-model-item class="itemModel">
-                <a-date-picker class="box-input"
-                               :getCalendarContainer="(trigger) => trigger.parentNode"
-                               :placeholder="$t('PleaseSelect')+$t('ImplementationDate')"
-                               @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"
-                               format="YYYY-MM-DD"
-                               v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"
-                               :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"
-                               style="width: 100%"/>
+                         :disabled="formInline.roleCode == 0 ? false : true"
+                         v-model="formInline.applicableSupplement"
+                         :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
               </a-form-model-item>
             </div>
           </a-col>
+          <!--          <a-col :span="12">-->
+          <!--            <div class="box-title-text">-->
+          <!--              <div class="title-text">-->
+          <!--                <span class="title-text-text" :title="'WVTA ID'">WVTA ID</span>-->
+          <!--              </div>-->
+          <!--              <a-form-model-item class="itemModel" prop="wvtaId">-->
+          <!--                <a-input class="box-input"-->
+          <!--                         :disabled="false"-->
+          <!--                         v-model="formInline.wvtaId"-->
+          <!--                         :placeholder="$t('PleaseEnter')+'WVTA ID'"/>-->
+          <!--              </a-form-model-item>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
         </a-row>
+        <!--        <a-row :gutter="24">-->
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('correspondingStandard')">{{$t('correspondingStandard')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" :prop="'correspondingStandard'">-->
+        <!--                <a-input class="box-input"-->
+        <!--                         :disabled="true"-->
+        <!--                         v-model="formInline.correspondingStandard"-->
+        <!--                         :placeholder="$t('PleaseEnter')+$t('correspondingStandard')"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('implementationCategory')">{{$t('implementationCategory')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" prop="implementType">-->
+        <!--                <j-dict-select-tag class="box-input" v-model="formInline.implementType"-->
+        <!--                                   :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"-->
+        <!--                                   @input="handleInput('implementType')"-->
+        <!--                                   :placeholder="$t('PleaseSelect')+$t('implementationCategory')"-->
+        <!--                                   :type="'select'"-->
+        <!--                                   :triggerChange="false" :dictCode="'implement_type'"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
+        <!--        <a-row :gutter="24">-->
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text"-->
+        <!--                      :title="$t('vehicleInProductionDate')">{{$t('vehicleInProductionDate')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel" :prop="'implementTime'">-->
+        <!--                <a-date-picker class="box-input"-->
+        <!--                               :placeholder="$t('PleaseSelect')+$t('vehicleInProductionDate')"-->
+        <!--                               :getCalendarContainer="(trigger) => trigger.parentNode"-->
+        <!--                               @change="dateChange({db_field_name:'implementTime'})"-->
+        <!--                               format="YYYY-MM-DD"-->
+        <!--                               v-model="formInline.implementTime"-->
+        <!--                               :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"-->
+        <!--                               style="width: 100%"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--          <a-col :span="12">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text" :title="$t('ImplementationDate')">{{$t('ImplementationDate')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel">-->
+        <!--                <a-date-picker class="box-input"-->
+        <!--                               :getCalendarContainer="(trigger) => trigger.parentNode"-->
+        <!--                               :placeholder="$t('PleaseSelect')+$t('ImplementationDate')"-->
+        <!--                               @change="dateChange({db_field_name:'xin1Che1Xing2Shi2Shi1Ri4Qi1'})"-->
+        <!--                               format="YYYY-MM-DD"-->
+        <!--                               v-model="formInline.xin1Che1Xing2Shi2Shi1Ri4Qi1"-->
+        <!--                               :disabled="formInline.roleCode == 0 || formInline.roleCode == 1 ? false : true"-->
+        <!--                               style="width: 100%"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
         <a-row :gutter="24">
           <a-col :span="12">
             <div class="box-title-text">
@@ -186,7 +200,7 @@
               </a-form-model-item>
             </div>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="12" v-if="formInline.roleCode == 0">
             <div class="box-title-text">
               <div class="title-text">
                 <span class="Required" v-if="formInline.roleCode == 0">*</span>
@@ -211,7 +225,7 @@
             </div>
           </a-col>
         </a-row>
-        <a-row :gutter="24">
+        <a-row :gutter="24" v-if="formInline.roleCode == 0">
           <a-col :span="12">
             <div class="box-title-text">
               <div class="title-text">
@@ -262,54 +276,40 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>
-              </div>
-              <a-form-model-item class="itemModel-multi" prop="region">
-                <!--                <a-input class="box-input"-->
-                <!--                         :disabled="true"-->
-                <!--                         v-model="formInline.region_dictText"/>-->
-                <j-multi-select-tag class="box-input" v-model="formInline.region"
-                                    :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"
-                                    :type="'select'"
-                                    :triggerChange="false" :dictCode="'region'"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-          <a-col :span="12">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text"
-                      :title="$t('applicableSupplement')">{{$t('applicableSupplement')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="applicableSupplement">
-                <a-input class="box-input"
-                         :disabled="false"
-                         v-model="formInline.applicableSupplement"
-                         :placeholder="$t('PleaseEnter')+$t('applicableSupplement')"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>
-              </div>
-              <a-form-model-item class="itemModel-text" :prop="'remarks'">
-                <a-textarea
-                  style="width: 100%"
-                  :placeholder="$t('PleaseEnter')+$t('remarks')"
-                  :disabled="false"
-                  v-model="formInline.remark" :rows="4"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
+          <!--          <a-col :span="12">-->
+          <!--            <div class="box-title-text">-->
+          <!--              <div class="title-text">-->
+          <!--                <span class="title-text-text"-->
+          <!--                      :title="$t('zoneOfApplication')">{{$t('zoneOfApplication')}}</span>-->
+          <!--              </div>-->
+          <!--              <a-form-model-item class="itemModel-multi" prop="region">-->
+          <!--                &lt;!&ndash;                <a-input class="box-input"&ndash;&gt;-->
+          <!--                &lt;!&ndash;                         :disabled="true"&ndash;&gt;-->
+          <!--                &lt;!&ndash;                         v-model="formInline.region_dictText"/>&ndash;&gt;-->
+          <!--                <j-multi-select-tag class="box-input" v-model="formInline.region"-->
+          <!--                                    :placeholder="$t('PleaseSelect')+$t('zoneOfApplication')"-->
+          <!--                                    :type="'select'"-->
+          <!--                                    :triggerChange="false" :dictCode="'region'"/>-->
+          <!--              </a-form-model-item>-->
+          <!--            </div>-->
+          <!--          </a-col>-->
         </a-row>
+        <!--        <a-row :gutter="24">-->
+        <!--          <a-col :span="24">-->
+        <!--            <div class="box-title-text">-->
+        <!--              <div class="title-text">-->
+        <!--                <span class="title-text-text" :title="$t('remarks')">{{$t('remarks')}}</span>-->
+        <!--              </div>-->
+        <!--              <a-form-model-item class="itemModel-text" :prop="'remarks'">-->
+        <!--                <a-textarea-->
+        <!--                  style="width: 100%"-->
+        <!--                  :placeholder="$t('PleaseEnter')+$t('remarks')"-->
+        <!--                  :disabled="false"-->
+        <!--                  v-model="formInline.remark" :rows="4"/>-->
+        <!--              </a-form-model-item>-->
+        <!--            </div>-->
+        <!--          </a-col>-->
+        <!--        </a-row>-->
         <div class="header-text">
           &nbsp;{{$t('confirmationOfDesignConformity')}}
         </div>
@@ -325,7 +325,7 @@
                   tree-node-filter-prop="title"
                   v-model="formInline.designDeliverableType"
                   :maxTagCount="1"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
+                  :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
@@ -349,7 +349,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="designDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDeliverableType ? true : false"
+                          :disabled="formInline.taskAffirmStatus != 'Not started' ? true : false"
                           @click="clickButtonToUpload('designDeliverableTemplate')">
                   {{ (formInline.designDeliverableTemplate === 'null' || formInline.designDeliverableTemplate === '' ||
                   formInline.designDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -398,7 +398,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="designDutyId">
                 <a-select :placeholder="$t('PleaseSelect')+$t('personLiable')"
-                          :disabled="designDutyIdDisabled"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           class="box-input"
                           allowClear
@@ -435,7 +434,6 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.designDueDate"
-                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -452,7 +450,6 @@
                 <a-textarea
                   style="width: 100%"
                   :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.designRemark ? true : false"
                   v-model="formInline.designRemark" :rows="4"/>
               </a-form-model-item>
             </div>
@@ -473,7 +470,6 @@
                   tree-node-filter-prop="title"
                   v-model="formInline.prehomoDeliverableType"
                   :maxTagCount="1"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
@@ -498,7 +494,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="prehomoDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDeliverableType ? true : false"
                           @click="clickButtonToUpload('prehomoDeliverableTemplate')">
                   {{ (formInline.prehomoDeliverableTemplate === 'null' || formInline.prehomoDeliverableTemplate === ''
                   ||
@@ -551,7 +546,6 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="prehomoDutyIdDisabled"
                           v-model="formInline.prehomoDutyId">
                   <a-select-option v-for="(item, key) in prehomoDutyList"
                                    :key="key"
@@ -585,7 +579,6 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.prehomoDueDate"
-                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -602,7 +595,6 @@
                 <a-textarea
                   style="width: 100%"
                   :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.prehomoRemark ? true : false"
                   v-model="formInline.prehomoRemark" :rows="4"/>
               </a-form-model-item>
             </div>
@@ -623,7 +615,6 @@
                   tree-node-filter-prop="title"
                   v-model="formInline.verifyDeliverableType"
                   :maxTagCount="1"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
                   :getPopupContainer="triggerNode=> triggerNode.parentNode"
                   class="box-input"
                   style="width: 100%"
@@ -648,7 +639,6 @@
               </div>
               <a-form-model-item class="itemModel" prop="verifyDeliverableTemplate">
                 <a-button type="primary" class="button-text"
-                          :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDeliverableType ? true : false"
                           @click="clickButtonToUpload('verifyDeliverableTemplate')">
                   {{ (formInline.verifyDeliverableTemplate === 'null' || formInline.verifyDeliverableTemplate === '' ||
                   formInline.verifyDeliverableTemplate == null) ? $t('clickUpload') : $t('viewUploadedFiles')
@@ -700,7 +690,6 @@
                           class="box-input"
                           allowClear
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                          :disabled="verifyDutyIdDisabled"
                           v-model="formInline.verifyDutyId">
                   <a-select-option v-for="(item, key) in verifyDutyList"
                                    :key="key"
@@ -734,7 +723,6 @@
                                format="YYYY-MM-DD"
                                :getCalendarContainer="(trigger) => trigger.parentNode"
                                v-model="formInline.verifyDueDate"
-                               :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyDueDate ? true : false"
                                style="width: 100%"/>
               </a-form-model-item>
             </div>
@@ -751,7 +739,6 @@
                 <a-textarea
                   style="width: 100%"
                   :placeholder="$t('PleaseEnter')+$t('descriptionDeliverables')"
-                  :disabled="formInline.taskAffirmStatus != 'Not started' && !formInline.verifyRemark ? true : false"
                   v-model="formInline.verifyRemark" :rows="4"/>
               </a-form-model-item>
             </div>
@@ -908,36 +895,22 @@
         })
       },
       getDis(val) {
-        if (val.taskAffirmStatus != 'Not started' && !val.designInitiatorId) {
+        if (val.taskAffirmStatus != 'Not started') {
           this.designInitiatorDisabled = true
         } else if (val.roleCode == 0) {
           this.designInitiatorDisabled = false
         } else {
           this.designInitiatorDisabled = true
         }
-        if (val.taskAffirmStatus != 'Not started' && !val.designDutyId) {
-          this.designDutyIdDisabled = true
-        } else if (val.roleCode == 0) {
-          this.designDutyIdDisabled = false
-        } else {
-          this.designDutyIdDisabled = true
-        }
-        if (val.taskAffirmStatus != 'Not started' && !val.prehomoInitiatorId) {
+        if (val.taskAffirmStatus != 'Not started') {
           this.prehomoInitiatorIdDisabled = true
         } else if (val.roleCode == 0) {
           this.prehomoInitiatorIdDisabled = false
         } else {
           this.prehomoInitiatorIdDisabled = true
         }
-        if (val.taskAffirmStatus != 'Not started' && !val.prehomoDutyId) {
-          this.prehomoDutyIdDisabled = true
-        } else if (val.roleCode == 0) {
-          this.prehomoDutyIdDisabled = false
-        } else {
-          this.prehomoDutyIdDisabled = true
-        }
 
-        if (val.taskAffirmStatus != 'Not started' && !val.verifyDutyId) {
+        if (val.taskAffirmStatus != 'Not started') {
           this.verifyDutyIdDisabled = true
         } else if (val.roleCode == 0) {
           this.verifyDutyIdDisabled = false
@@ -945,13 +918,6 @@
           this.verifyDutyIdDisabled = true
         }
 
-        if (val.taskAffirmStatus != 'Not started' && !val.verifyInitiatorId) {
-          this.verifyInitiatorIdDisabled = true
-        } else if (val.roleCode == 0) {
-          this.verifyInitiatorIdDisabled = false
-        } else {
-          this.verifyInitiatorIdDisabled = true
-        }
       },
       getProject(row, res, callback) {
         //设计符合性确认-发起人