From 166735af89328312bb7dc44acf23d2f147565da3 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Wed, 6 Sep 2023 10:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addModelconformance.vue        |  66 +-
 .../components/detilModel.vue                 | 438 ++-------
 .../components/nonConformance.vue             | 847 ++++++++++--------
 .../projectNonConformance/index.vue           |   2 +-
 .../moudles/addModel.vue                      |   3 +-
 .../moudles/detilModel.vue                    |   4 +-
 6 files changed, 634 insertions(+), 726 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue
index cb346c2fa..a3ce7b1ee 100644
--- a/jero-web/src/views/projectManagement/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue
@@ -231,6 +231,7 @@
                              style='width: 89%'
                              v-model='item.progressTracking'
                              :disabled="true"
+                             :title='item.progressTracking'
                              :placeholder="$t('PleaseEnter')+$t('progresstracking')"/>
                     <a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progressTrackingList.length - 1 == index">{{$t('newlyAdded')}}</a>
                     <a @click="deleteprogresstrackingClick(index,item)" v-if="formInline.progressTrackingList.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
@@ -386,7 +387,10 @@ export default {
       formInline: {
         fileLinkList:[{}],
         progressTrackingList:[{}],
-        approvalEvidenceLinkList:[{}]
+        approvalEvidenceLinkList:[{}],
+        dutyTerritory:undefined,
+        projectId:undefined,
+        problemState:undefined,
       },
       formInlinetracking:{},
       confirmLoading: false,
@@ -432,7 +436,7 @@ export default {
     //   this.$refs.addModelRef.addModel()
     // },
     getNameList() {
-      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
           this.projectNameList = res.result || []
         } else {
@@ -502,14 +506,29 @@ export default {
       })
     },
     edit(row) {
+      console.log(row)
       this.getNameList()
       this.getFirstLevelDutyTerritory()
       this.title = this.$t('edit')
+      this.formInline = row
+      if(this.formInline.dutyTerritory != null){
+        this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
+      }else{
+        this.formInline.dutyTerritory = undefined
+      }
+      if(this.formInline.problemState == null){
+        this.formInline.problemState = undefined
+      }
+      if(this.formInline.projectId != null){
+        this.formInline.projectId = this.formInline.projectId.split(',')
+      }else{
+        this.formInline.projectId = undefined
+      }
+      console.log(this.formInline)
       this.visible = true
       this.disabled = false
       this.templateDisabled = true
       this.$nextTick(() => {
-        this.formInline = row
         this.$refs.ruleForm.clearValidate()
       })
     },
@@ -588,21 +607,56 @@ export default {
             url = this.url.add
             action = postAction
           }
-          let formInline = JSON.parse(JSON.stringify(this.formInline))
           // Object.keys(formInline).forEach(res => {
           //   if (formInline[res] && formInline[res] instanceof Array) {
           //     formInline[res] = formInline[res].join(',')
           //   }
           // })
+          let formInline = JSON.parse(JSON.stringify(this.formInline))
+          if(this.formInline.dutyTerritory && this.formInline.dutyTerritory instanceof Array){
+            this.formInline.dutyTerritory = this.formInline.dutyTerritory.join(',')
+          }
+          if(this.formInline.projectId && this.formInline.projectId instanceof Array){
+            this.formInline.projectId = this.formInline.projectId.join(',')
+          }
+          // let fileLinkList = []
+          // let approvalEvidenceLinkList = []
+          // let progressTrackingList = []
+          // if(this.formInline.fileLinkList){
+          //   this.formInline.fileLinkList.forEach(item => {
+          //     if(item.fileLink){
+          //       fileLinkList.push(item.fileLink)
+          //     }
+          //   })
+          //   this.formInline.fileLinkList = fileLinkList
+          // }
+          // if(this.formInline.approvalEvidenceLinkList){
+          //   this.formInline.approvalEvidenceLinkList.forEach(item => {
+          //     if(item.approvalEvidenceLink){
+          //       approvalEvidenceLinkList.push(item.approvalEvidenceLink)
+          //     }
+          //   })
+          //   this.formInline.approvalEvidenceLinkList = approvalEvidenceLinkList
+          // }
+          // if(this.formInline.progressTrackingList){
+          //   this.formInline.progressTrackingList.forEach(item => {
+          //     if(item.progressTracking){
+          //       progressTrackingList.push(item.progressTracking)
+          //     }
+          //   })
+          //   this.formInline.progressTrackingList = progressTrackingList
+          // }
+          delete this.formInline.lawsName
           let query = {
-            problemManagementEO:formInline
+            // problemManagementEO:formInline
+            ...this.formInline
           }
           action(url, query).then((res) => {
             if (res.success) {
               this.$message.success(this.$t('OperationSuccessful'))
               this.visible = false
               this.confirmLoading = false
-              this.$emit('fillAddForm')
+              this.$emit('addModelForm')
             } else {
               this.confirmLoading = false
               this.$message.warning(this.$t('operationFailed'))
diff --git a/jero-web/src/views/projectManagement/components/detilModel.vue b/jero-web/src/views/projectManagement/components/detilModel.vue
index 7d06b0f9d..922449839 100644
--- a/jero-web/src/views/projectManagement/components/detilModel.vue
+++ b/jero-web/src/views/projectManagement/components/detilModel.vue
@@ -15,15 +15,13 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
                   <span class="title-text-text"
                         :title="$t('title')">{{$t('title')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="title">
                   <a-input class="box-input"
                            v-model='formInline.title'
-                           :disabled="disabled"
-                           :placeholder="$t('PleaseEnter')+$t('title')"/>
+                           :disabled="disabled"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -32,13 +30,12 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-                  <span class="Required">*</span>
                   <span class="title-text-text"
                         :title="$t('problemType')">{{$t('problemType')}}</span>
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="problemType">
                   <j-dict-select-tag class="box-input" v-model="formInline.problemType"
-                                     :placeholder="$t('PleaseSelect')+$t('problemType')"
+                                     :disabled="disabled"
                                      :type="'select'"
                                      :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
                 </a-form-model-item>
@@ -47,47 +44,14 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-<!--                  <span class="Required">*</span>-->
+                  <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
                         :title="'PS-issue'">{{'PS-issue'}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="issue">
                   <a-input class="box-input"
-                           v-model='formInline.issue'
-                           :disabled="disabled"
-                           :placeholder="$t('PleaseEnter')+'PS-issue'"/>
-                </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="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('creator')">{{$t('creator')}}</span>
-                </div>
-                <a-form-model-item class="itemModel-multi" prop="creator">
-                  <a-input class="box-input"
-                           v-model='formInline.creator'
-                           :disabled="true"
-                           :placeholder="$t('PleaseEnter')+$t('creator')"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
-                  <span class="title-text-text"
-                        :title="$t('createTime')">{{$t('createTime')}}</span>
-                </div>
-                <a-form-model-item class="itemModel" prop="createTime">
-                  <a-input class="box-input"
-                           v-model='formInline.createTime'
-                           :disabled="true"
-                           :placeholder="$t('PleaseEnter')+$t('createTime')"/>
+                           v-model='formInline.psIssue'
+                           :disabled="disabled"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -101,12 +65,10 @@
                         :title="$t('Relevantlawsregulations')">{{$t('Relevantlawsregulations')}}</span>
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="creator">
-                  <Standardselection
-                    :query="{'db_field_txt':$t('standard')}"
-                    :standard="formInline"
-                    :disabled="false"
-                    @change="StandardselectionChange"
-                    v-model="formInline.serialNumber"/>
+                  <a-input class="box-input"
+                           :title='formInline.lawsName'
+                           v-model='formInline.lawsName'
+                           :disabled="disabled"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -120,17 +82,17 @@
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.projectName"
+                            v-model="formInline.projectId"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
                             mode="multiple"
+                            :disabled="disabled"
                             optionFilterProp="label"
-                            :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('RelatedItems')">
+                            :autoClearSearchValue="false">
                     <a-select-option v-for="(item, key) in projectNameList"
                                      :key="key"
                                      :label="item.projectName"
-                                     :value="item.projectName">
+                                     :value="item.id">
                      <span style="display: inline-block;width: 100%" :title=" item.projectName ">
                            {{ item.projectName}}
                      </span>
@@ -149,14 +111,15 @@
                         :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="creator">
-                  <a-select :placeholder="$t('PleaseSelect')+$t('statisticalNodes')"
-                            allowClear
-                            show-search
-                            mode="multiple"
-                            class="box-input-search"
-                            optionFilterProp="label"
-                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            v-model="formInline.firstLevelDutyTerritory">
+                  <a-select
+                    allowClear
+                    show-search
+                    mode="multiple"
+                    :disabled="disabled"
+                    class="box-input-search"
+                    optionFilterProp="label"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    v-model="formInline.dutyTerritory">
                     <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                      :key="key"
                                      :label="item.key"
@@ -179,12 +142,12 @@
                 <a-form-model-item class="itemModel" prop="contentTemplate">
                   <a-select allowClear
                             class="box-input"
-                            v-model="formInline.flowType"
+                            v-model="formInline.problemState"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
                             showSearch
+                            :disabled="disabled"
                             optionFilterProp="label"
-                            :autoClearSearchValue="false"
-                            :placeholder="$t('PleaseSelect')+$t('Problemstate')">
+                            :autoClearSearchValue="false">
                     <a-select-option v-for="(item, key) in ProblemstateList"
                                      :label='item'
                                      :key="key"
@@ -202,69 +165,49 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-<!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
                         :title="$t('descriptions')">{{$t('descriptions')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="descriptions">
                   <a-input class="box-input"
-                           v-model='formInline.descriptions'
-                           :disabled="disabled"
-                           :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
+                           v-model='formInline.description'
+                           :disabled="disabled"/>
                 </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="Required">*</span>-->
-                    <span class="title-text-text"
-                          :title="$t('documents')">{{$t('documents')}}</span>
-                  </div>
-                    <a-form-model-item class="itemModel" prop="xgwj">
-                      <div v-for="(item,index) in formInline.list" :key="index">
-                        <a-input class="box-input"
-                                 style='width: 94%'
-                                 v-model='item.xgwj'
-                                 :disabled="disabled"
-                                 :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
-                        <a-icon class="icon-text" @click="addClick(index)" style='margin-left: 10px;font-size: 18px;'
-                                v-if="formInline.list.length - 1 == index"
-                                type="plus"/>
-                        <a-icon class="icon-text" v-if="formInline.list.length > 1 && formInline.list.length - 1 !== index" style='margin-left: 10px;font-size: 18px;'
-                                @click="deleteClick(index)"
-                                type="minus"/>
-                      </div>
-                      <a-button type="primary" class="button-text"
-                                @click="clickButtonToUpload('accessory_id')">
-                        {{ (formInline.accessory_id === 'null' || formInline.accessory_id === '' ||
-                        formInline.accessory_id == null) ? $t('Fileupload') : $t('viewUploadedFiles')
-                        }}
-                      </a-button>
-                    </a-form-model-item>
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text"
+                        :title="$t('documents')">{{$t('documents')}}</span>
                 </div>
-              </a-col>
+                <a-form-model-item class="itemModel" prop="fileLink">
+                  <div v-for="(item,index) in formInline.fileLinkList" :key="index">
+                    <a @click='UserFeedback(item.fileLink)'>{{item.fileLink}}</a>
+                  </div>
+                  <div v-for='(item,index) in formInline.fileList'>
+                    <a @click='download(item)'>{{item.fileName}}</a>
+                  </div>
+                </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="Required">*</span>-->
                   <span class="title-text-text"
                         :title="$t('progresstracking')">{{$t('progresstracking')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="progresstracking">
-                  <div v-for="(item,index) in formInline.progresstrackinglist" :key="index">
-<!--                    <span>{{item}}</span>-->
+                  <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
                     <a-input class="box-input"
-                             style='width: 94%'
-                             v-model='item.text'
-                             :disabled="true"
-                             :placeholder="$t('PleaseEnter')+$t('progresstracking')"/>
-                    <a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progresstrackinglist.length - 1 == index">{{$t('newlyAdded')}}</a>
-                    <a @click="deleteprogresstrackingClick(index)" v-if="formInline.progresstrackinglist.length > 1 && formInline.progresstrackinglist.length - 1 !== index" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
+                             style='width: 89%'
+                             v-model='item.progressTracking'
+                             :title='item.progressTracking'
+                             :disabled="true"/>
                   </div>
                 </a-form-model-item>
               </div>
@@ -274,15 +217,13 @@
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
-                  <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
                         :title="$t('conculsion')">{{$t('conculsion')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="conculsion">
+                <a-form-model-item class="itemModel" prop="conclusion">
                   <a-input class="box-input"
-                           v-model='formInline.conculsion'
-                           :disabled="disabled"
-                           :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
+                           v-model='formInline.conclusion'
+                           :disabled="disabled"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -295,26 +236,13 @@
                   <span class="title-text-text"
                         :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span>
                 </div>
-                <a-form-model-item class="itemModel" prop="xgwj">
-                  <div v-for="(item,index) in formInline.examineapproveevidencelist" :key="index">
-                    <a-input class="box-input"
-                             style='width: 94%'
-                             v-model='item.xgwj'
-                             :disabled="disabled"
-                             :placeholder="$t('PleaseEnter')+$t('Addresslink')"/>
-                    <a-icon class="icon-text" @click="addvidenceClick(index)" style='margin-left: 10px;font-size: 18px;'
-                            v-if="formInline.examineapproveevidencelist.length - 1 == index"
-                            type="plus"/>
-                    <a-icon class="icon-text" v-if="formInline.examineapproveevidencelist.length > 1 && formInline.examineapproveevidencelist.length - 1 !== index"
-                            style='margin-left: 10px;font-size: 18px;' @click="deletevidenceClick(index)"
-                            type="minus"  :disabled="disabled"/>
+                <a-form-model-item class="itemModel" prop="approvalEvidenceLink">
+                  <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
+                    <a @click='UserFeedback(item.approvalEvidenceLink)'>{{item.approvalEvidenceLink}}</a>
+                  </div>
+                  <div v-for='(item,index) in formInline.approvalEvidenceFileList'>
+                    <a @click='download(item)'>{{item.fileName}}</a>
                   </div>
-                  <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' ||
-                    formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles')
-                    }}
-                  </a-button>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -322,68 +250,21 @@
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button">
-        <a-button style="margin-right:  8px" @click="handleCancel">{{$t('cancel')}}</a-button>
-        <a-button @click="handleSubmit" v-if="!disabled" type="primary" :loading="confirmLoading">{{$t('submit')}}
-        </a-button>
+        <a-button style="margin-right:  8px" @click="handleCancel">{{$t('close')}}</a-button>
       </div>
     </a-drawer>
-<!--    <addModel ref="addModelRef" @addModelForm="addModelForm"/>-->
-    <a-modal
-      :title="$t('progresstracking')"
-      :width="600"
-      :visible="visibletrack"
-      :confirm-loading="confirmLoading"
-      :maskClosable="false"
-      @ok="handleOk"
-      @cancel="Cancel"
-    >
-      <a-form-model :model="formInlinetracking" class="formAdd" :rules="rulestracking" ref="ruleFormtracking">
-        <a-row :gutter="24">
-          <a-col :span="24">
-            <div class="box-title-text">
-              <div class="title-text">
-                <span class="Required">*</span>
-                <span class="title-text-text" :title="$t('progresstracking')">
-                {{$t('progresstracking')}}</span>
-              </div>
-              <a-form-model-item class="itemModel" prop="text">
-                <a-textarea :placeholder="$t('pleaseEnter')+$t('progresstracking')"
-                            v-model="formInlinetracking.text"
-                            style="width: 90%"
-                            :maxLength="500"
-                            :rows="4"/>
-              </a-form-model-item>
-            </div>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </a-modal>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
 
 <script>
-// import defaultTemplate from './defaultTemplate'
-// import solicitOpinions from './solicitOpinions'
-// import releaseStandard from './releaseStandard'
-// import industryTemplate from './industryTemplate'
-// import addModel from './a/ddModel'
-import Standardselection from '@/components/Standardselection/index'
-import uploadFile from '@/components/uploadFile/file'
-import { getAction, postAction, downloadFile } from '@/api/manage'
+import { getAction, postAction,putAction, downloadFile } from '@/api/manage'
 import moment from 'moment'
 import { mapGetters } from 'vuex'
 
 export default {
   name: 'fillAdd',
   components: {
-    // defaultTemplate,
-    // solicitOpinions,
-    // releaseStandard,
-    // industryTemplate,
-    // addModel
-    Standardselection,
-    uploadFile,
+
   },
   data() {
     return {
@@ -406,7 +287,7 @@ export default {
       visible: false,
       visibletrack: false,
       rulestracking:{
-        text: [
+        progressTracking: [
           {
             required: true,
             message: this.$t('text') + this.$t('cannotEmpty'),
@@ -415,9 +296,12 @@ export default {
         ]
       },
       formInline: {
-        list:[{}],
-        examineapproveevidencelist:[{}],
-        progresstrackinglist:[{}]
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLinkList:[{}],
+        dutyTerritory:undefined,
+        projectId:undefined,
+        problemState:undefined,
       },
       formInlinetracking:{},
       confirmLoading: false,
@@ -449,8 +333,8 @@ export default {
       ],
       index:'',
       url: {
-        add: '/report/lawsMonthlyReportWriteEO/add',
-        edit: '/report/lawsMonthlyReportWriteEO/edit',
+        add: '/project/problemManagementEO/add',
+        edit: '/project/problemManagementEO/edit',
         queryById: '/report/lawsMonthlyReportWriteEO/queryById'
       }
     }
@@ -459,11 +343,8 @@ export default {
 
   },
   methods: {
-    // bringInStandardInformationClick() {
-    //   this.$refs.addModelRef.addModel()
-    // },
     getNameList() {
-      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
           this.projectNameList = res.result || []
         } else {
@@ -471,9 +352,6 @@ export default {
         }
       })
     },
-    addModelForm(value) {
-      this.$refs.defaultTemplateRef.getStandData(value)
-    },
     getFirstLevelDutyTerritory() {
       getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
         if (res.success) {
@@ -483,170 +361,48 @@ export default {
         }
       })
     },
-    StandardselectionChange(value, id) {
-      console.log(id)
-      this.formInline.documentId = id
-      this.formInline = { ...this.formInline }
-    },
-    clickButtonToUpload(item) {
-      this.$refs.uploadFile.perentHandleFunc()
-      this.$refs.uploadFile.visible = true
-      this.uploadName = item
-      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
-        if (res.success) {
-          this.$refs.uploadFile.perentHandleFunc(res.result)
-        } else {
-          this.$refs.uploadFile.perentHandleFunc()
-        }
-      })
-    },
-    /** 上传文件的回调 */
-    uploadSuccess(data) {
-      let attIdList = []
-      if (data && data.length > 0) {
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
-      }
-      /** 赋值给当前对应的表单文件 */
-      this.formInline[this.uploadName] = attIdList.join(',')
-      this.formInline = { ...this.formInline }
-    },
     ...mapGetters(['userInfo']),
-    add() {
-      console.log(this.userInfo())
-      this.templateDisabled = false
-      this.getNameList()
-      this.getFirstLevelDutyTerritory()
-      this.title = this.$t('newlyAdded')
-      this.visible = true
-      this.disabled = false
-      this.formInline = {
-        list:[{}],
-        examineapproveevidencelist:[{}],
-        progresstrackinglist:[{}]
-      }
-      this.$nextTick(() => {
-        this.formInline = { ...this.formInline }
-        this.$refs.ruleForm.clearValidate()
-      })
-    },
     edit(row) {
       this.getNameList()
       this.getFirstLevelDutyTerritory()
-      this.title = this.$t('edit')
+      this.title = this.$t('view')
+      this.formInline = row
+      if(this.formInline.dutyTerritory != null){
+        this.formInline.dutyTerritory = this.formInline.dutyTerritory.split(',')
+      }else{
+        this.formInline.dutyTerritory = undefined
+      }
+      if(this.formInline.problemState == null){
+        this.formInline.problemState = undefined
+      }
+      if(this.formInline.projectId != null){
+        this.formInline.projectId = this.formInline.projectId.split(',')
+      }else{
+        this.formInline.projectId = undefined
+      }
+      getAction('/project/problemManagementEO/queryById', {id:this.formInline.id}).then((res) => {
+        if (res.success) {
+          this.formInline.fileList = res.result.fileList
+          this.formInline.approvalEvidenceFileList = res.result.approvalEvidenceFileList
+        }
+      })
+      console.log(this.formInline)
       this.visible = true
-      this.disabled = false
-      this.templateDisabled = true
+      this.disabled = true
       this.$nextTick(() => {
-        this.formInline = row
         this.$refs.ruleForm.clearValidate()
       })
     },
-    addClick(index){
-      this.formInline.list.splice(index + 1, 0, {})
-      this.formInline = { ...this.formInline }
+    UserFeedback(item){
+      window.open(item, '_blank');
     },
-    deleteClick(index) {
-      this.formInline.list.splice(index, 1)
-      this.formInline = { ...this.formInline }
-    },
-    addvidenceClick(index){
-      this.formInline.examineapproveevidencelist.splice(index + 1, 0, {})
-      this.formInline = { ...this.formInline }
-    },
-    deletevidenceClick(index) {
-      this.formInline.examineapproveevidencelist.splice(index, 1)
-      this.formInline = { ...this.formInline }
-    },
-    addprogresstrackingClick(index){
-      this.index = index
-      this.formInlinetracking = {}
-      this.visibletrack = true
-      this.$nextTick(() => {
-        this.formInlinetracking = { ...this.formInlinetracking }
-        this.isTrue = true
-        this.$refs.ruleForm.clearValidate()
-      })
-    },
-    deleteprogresstrackingClick(index) {
-      this.formInline.progresstrackinglist.splice(index, 1)
-      this.formInline = { ...this.formInline }
+    download(item){
+      console.log(item)
+      downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id })
     },
     handleCancel() {
       this.visible = false
     },
-    Cancel(){
-      this.visibletrack = false
-      this.formInlinetracking = {}
-      this.$refs.ruleFormtracking.clearValidate()
-    },
-    handleOk(){
-      console.log(this.formInlinetracking)
-      let time = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
-      this.$refs.ruleFormtracking.validate(valid => {
-        if (valid) {
-          let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.text
-          this.formInline.progresstrackinglist.forEach((item,index) => {
-            console.log(item.text)
-            if(!item.text){
-              this.formInline.progresstrackinglist.splice(0,1)
-            }
-          })
-          this.formInline.progresstrackinglist.splice(this.index+1, 1, {text:text})
-          this.visibletrack = false
-        }
-      })
-    },
-    handleSubmit() {
-      console.log(this.formInline)
-      this.$refs.ruleForm.validate(valid => {
-        if (valid) {
-          let text = ''
-          if (this.$refs.defaultTemplateRef) {
-            text = 'defaultTemplateRef'
-          } else if (this.$refs.solicitOpinionsRef) {
-            text = 'solicitOpinionsRef'
-          } else if (this.$refs.releaseStandardRef) {
-            text = 'releaseStandardRef'
-          } else if (this.$refs.industryTemplateRef) {
-            text = 'industryTemplateRef'
-          }
-          this.$refs[text].getData((val) => {
-            this.confirmLoading = true
-            let url = ''
-            if (this.formInline.id) {
-              url = this.url.edit
-            } else {
-              url = this.url.add
-            }
-            let formInline = JSON.parse(JSON.stringify(this.formInline))
-            Object.keys(formInline).forEach(res => {
-              if (formInline[res] && formInline[res] instanceof Array) {
-                formInline[res] = formInline[res].join(',')
-              }
-            })
-            let query = Object.assign(val, {
-              month: formInline.month,
-              memoriesChapter: formInline.memoriesChapter,
-              contentTemplate: formInline.contentTemplate,
-              memoriesChapterOne:formInline.memoriesChapterOne
-            })
-            postAction(url, query).then((res) => {
-              if (res.success) {
-                this.$message.success(this.$t('OperationSuccessful'))
-                this.visible = false
-                this.confirmLoading = false
-                this.$emit('fillAddForm')
-              } else {
-                this.confirmLoading = false
-                this.$message.warning(this.$t('operationFailed'))
-              }
-            })
-          })
-        }
-      })
-    }
   }
 }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 1add5aba1..712660277 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -111,7 +111,7 @@
         <a-icon type="plus"/>
         {{$t('newlyAdded')}}
       </div>
-      <div @click="handleExport" v-has="'ncrTrack:exportDataInfo'" class="operator-text">
+      <div @click="handleExport" v-has="'ncrTrack:exportData'" class="operator-text">
         <a-icon type="export" :rotate="-90"/>
         {{ $t('export') }}
       </div>
@@ -120,23 +120,36 @@
       <a-table
         ref="table"
         size="middle"
+        rowKey="uuid"
         :components="drag(columns,'columns')"
         :loading="loading"
-        rowKey="uuid"
         :pagination="false"
         :scroll="{x: '100%'}"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         @change="tableOnChange"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :data-source="dataSource"
         :columns="columns"
       >
+        <!--        <span slot="standard" slot-scope="text,result">-->
+        <!--           <a @click="designFlowStatusClick(result)" class="textName" :title="text">-->
+        <!--             {{text}}-->
+        <!--           </a>-->
+        <!--        </span>-->
         <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-Progress box-content-cou"
-                   :style="{'width':long=='zh-cn'?'116px' : '148px'}"
-                   :class="CertificationColor[result.certificationProgress]"
-                   @click="CertificationProgressClick(result)"
+             <span v-if="result.problemState == $t('red')" class="box-content-Progress box-content-cou nonConformityColor"
+                   :style="{'width':long=='zh-cn'?'90px' : '120px'}"
              >
-              {{result.certificationProgress_dictText ? result.certificationProgress_dictText : $t('toBeStarted')}}
+              {{result.problemState ? result.problemState : ''}}
+             </span>
+          <span v-if="result.problemState == $t('green')" class="box-content-Progress box-content-cou accordColor"
+                :style="{'width':long=='zh-cn'?'90px' : '120px'}"
+          >
+              {{result.problemState ? result.problemState : ''}}
+             </span>
+          <span v-if="result.problemState == $t('yellow')" class="box-content-Progress box-content-cou TrackedColor"
+                :style="{'width':long=='zh-cn'?'90px' : '120px'}"
+          >
+              {{result.problemState ? result.problemState : ''}}
              </span>
         </div>
         <span slot="operation" slot-scope="text,record">
@@ -144,11 +157,11 @@
              @click="detil(record)">
                 {{ $t('See') }}
               </a>
-              <a class="text-operation"
+              <a class="text-operation" v-if="record.flag == 'NEW'"
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
-              <a class="text-operation"
+              <a class="text-operation" v-if="record.flag == 'NEW'"
                  @click="deleteLib(record)">
                 {{ $t('deleteLib') }}
               </a>
@@ -174,394 +187,476 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage'
-  import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
-  import store from '@/store/'
-  import addModel from './addModelconformance'
-  import detilModel from './detilModel'
-  import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
+import PersonnelSelection from '@/components/PersonnelSelection/index'
+import designCompliance from '../../toDoCenter/projectRegulationTasks/components/designCompliance'
+import store from '@/store/'
+import addModel from './addModelconformance'
+import detilModel from './detilModel'
+import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
 
-  export default {
-    name: 'nonConformance',
-    mixins:[ResizeHeader, ResizeColumnProvide],
-    components:{
-      designCompliance,
-      addModel,
-      detilModel,
-    },
-    data() {
-      return {
-        queryParam: {},
-        loading: false,
-        orderBy: '1',
-        orderByField: '',
-        dataSource: [],
-        selectedRowKeys: [],
-        projectNameList: [],
-        ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
-        CertificationColor: {
-          'red': 'nonConformityColor',
-          'green': 'accordColor',
-          'yellow': 'TrackedColor',
+export default {
+  name: 'projectNonConformance',
+  components: {
+    PersonnelSelection,
+    addModel,
+    detilModel,
+    designCompliance
+  },
+  mixins:[ResizeHeader, ResizeColumnProvide],
+  data() {
+    return {
+      queryParam: {},
+      loading: false,
+      dataSource: [],
+      selectedRowKeys: [],
+      projectNameList: [],
+      ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
+      // CertificationColor: {
+      //   $t('red'): 'nonConformityColor',
+      //   $t('green'): 'accordColor',
+      //   $t('yellow'): 'TrackedColor',
+      // },
+      toggleSearchStatus: false,
+      columns: [
+        {
+          title: this.$t('title'),
+          align: 'left',
+          dataIndex: 'title',
+          width: 170,
+          sorter:true,
+          ellipsis: true
         },
-        toggleSearchStatus: false,
-        columns: [
-          {
-            title: this.$t('title'),
-            align: 'left',
-            dataIndex: 'title',
-            width: 170,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('Relevantlawsregulations'),
-            align: 'left',
-            dataIndex: 'lawsName',
-            width: 170,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('RelatedItems'),
-            align: 'left',
-            dataIndex: 'projectName',
-            width: 170,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('problemType'),
-            align: 'left',
-            dataIndex: 'problemType',
-            width: 170,
-            sorter:true,
-            ellipsis: true,
-            scopedSlots: { customRender: 'CertificationProgress' }
-          },
-          {
-            title: this.$t('statisticalNodes'),
-            align: 'left',
-            dataIndex: 'dutyTerritory',
-            width: 100,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('creator'),
-            align: 'left',
-            dataIndex: 'creator',
-            width: 100,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('Problemstate'),
-            align: 'left',
-            dataIndex: 'problemState',
-            width: 120,
-            sorter:true,
-            ellipsis: true
-          },
-          {
-            title: this.$t('createTime'),
-            align: 'left',
-            dataIndex: 'createTime',
-            sorter:true,
-            width: 180
-          },
-          {
-            title: this.$t('updateTime'),
-            align: 'left',
-            dataIndex: 'updateTime',
-            sorter:true,
-            width: 180
-          },
-          {
-            title: this.$t('operation'),
-            align: 'left',
-            fixed: 'right',
-            width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
-            scopedSlots: { customRender: 'operation' }
-          }
-        ],
-        total: 0,
-        pageSize: 10,
-        pageNo: 1,
-        long: '',
-        isPersonnelSelection:true,
-        url: {
-          page: '/project/projectLawsInventoryEO/queryNotComplianList',
-          exportData: '/project/projectLawsInventoryEO/exportNotComplianList'
+        {
+          title: this.$t('Relevantlawsregulations'),
+          align: 'left',
+          dataIndex: 'lawsName',
+          width: 170,
+          sorter:true,
+          ellipsis: true
         },
-        content: []
-      }
-    },
-    mounted() {
-      this.long = localStorage.getItem('language') || 'zh-cn'
-      this.getList()
-      this.getNameList()
-    },
-    created() {
-      if (store.getters.userInfo) {
-        this.$socketPublic.dispatch('webSocketInit')//初始化ws
-      }
-    },
-    watch: {
-      '$socketPublic.state.msg': {
-        //处理接收到的消息
-        handler: function(res) {
-          let that = this
-          let data = JSON.parse(res.data)
-          if (data.msgId) {
-            this.getList()
-          }
+        {
+          title: this.$t('RelatedItems'),
+          align: 'left',
+          dataIndex: 'projectName',
+          width: 170,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('problemType'),
+          align: 'left',
+          dataIndex: 'problemType_dictText',
+          width: 170,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('statisticalNodes'),
+          align: 'left',
+          dataIndex: 'dutyTerritory',
+          width: 100,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('creator'),
+          align: 'left',
+          dataIndex: 'creator',
+          width: 100,
+          sorter:true,
+          ellipsis: true
+        },
+        {
+          title: this.$t('Problemstate'),
+          align: 'left',
+          dataIndex: 'problemState',
+          width: 120,
+          sorter:true,
+          ellipsis: true,
+          scopedSlots: { customRender: 'CertificationProgress' }
+        },
+        {
+          title: this.$t('createTime'),
+          align: 'left',
+          dataIndex: 'createTime',
+          sorter:true,
+          width: 180
+        },
+        {
+          title: this.$t('updateTime'),
+          align: 'left',
+          dataIndex: 'updateTime',
+          sorter:true,
+          width: 180
+        },
+        {
+          title: this.$t('operation'),
+          align: 'left',
+          fixed: 'right',
+          width: localStorage.getItem('language') == 'zh-cn' ? 160 : 180,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      orderBy: '1',
+      orderByField: '',
+      long: '',
+      isPersonnelSelection:true,
+      url: {
+        page: '/project/ncrTrackController/queryPage',
+        exportData: '/project/ncrTrackController/exportData'
+      },
+      content: []
+    }
+  },
+  created() {
+    if (store.getters.userInfo) {
+      this.$socketPublic.dispatch('webSocketInit')//初始化ws
+    }
+  },
+  mounted() {
+    this.long = localStorage.getItem('language') || 'zh-cn'
+    this.getList()
+    this.getNameList()
+  },
+  watch: {
+    '$socketPublic.state.msg': {
+      //处理接收到的消息
+      handler: function(res) {
+        let that = this
+        let data = JSON.parse(res.data)
+        if (data.msgId) {
+          this.getList()
         }
       }
+    }
+  },
+  methods: {
+    getNameList() {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
+        if (res.success) {
+          this.projectNameList = res.result || []
+        } else {
+          this.projectNameList = []
+        }
+      })
     },
-    methods: {
-      getNameList() {
-        getAction('project/projectNameInfoEO/list', {}).then((res) => {
-          if (res.success) {
-            this.projectNameList = res.result || []
-          } else {
-            this.projectNameList = []
-          }
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    },
+    searchQuery() {
+      this.pageNo = 1
+      this.getList()
+    },
+    addModelForm(){
+      this.getList()
+    },
+    onSelectChange(value) {
+      this.content = []
+      this.selectedRowKeys = value
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        this.dataSource.forEach(res => {
+          this.selectedRowKeys.forEach(val => {
+            if (res.uuid == val) {
+              this.content.push({
+                id: res.id,
+                flowType: res.flowType
+              })
+            }
+          })
         })
-      },
-      handleToggleSearch() {
-        this.toggleSearchStatus = !this.toggleSearchStatus
-      },
-      searchQuery() {
-        this.pageNo = 1
-        this.getList()
-      },
-      searchReset() {
-        this.pageNo = 1
-        this.queryParam = {}
-        this.getList()
-      },
-      pageOnChange(page, pageSize) {
-        this.pageNo = page
-        this.getList()
-      },
-      SizeChange(page, pageSize) {
-        this.pageNo = 1
-        this.pageSize = pageSize
-        this.getList()
-      },
-      onSelectChange(value) {
-        this.content = []
-        this.selectedRowKeys = value
-        if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-          this.dataSource.forEach(res => {
-            this.selectedRowKeys.forEach(val => {
-              if (res.uuid == val) {
-                this.content.push({
-                  id: res.id,
-                  flowType: res.flowType
-                })
-              }
-            })
+      }
+    },
+    searchReset() {
+      this.isPersonnelSelection = false
+      this.$nextTick(()=>{
+        this.isPersonnelSelection = true
+      })
+      this.pageNo = 1
+      this.queryParam = {}
+      this.getList()
+    },
+    pageOnChange(page, pageSize) {
+      this.pageNo = page
+      this.getList()
+    },
+    SizeChange(page, pageSize) {
+      this.pageNo = 1
+      this.pageSize = pageSize
+      this.getList()
+    },
+    tableOnChange(pagination, filters, sorter) {
+      this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+      this.orderByField = sorter.columnKey
+      this.getList()
+    },
+    getList() {
+      let query = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        orderBy: this.orderBy,
+        orderByField: this.orderByField,
+        ...this.queryParam
+      }
+      this.loading = true
+      getAction(this.url.page, query).then((res) => {
+        if (res.success) {
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.pageNo = 1
+            this.getList()
+            return
+          }
+          this.dataSource = res.result.records || []
+          this.total = res.result.total
+          this.loading = false
+        } else {
+          this.dataSource = []
+          this.loading = false
+        }
+      })
+    },
+    handleAdd(){
+      this.$refs.addModelRef.add()
+    },
+    edit(record){
+      this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record)))
+    },
+    detil(record){
+      if(record.flag == 'NEW'){
+        this.$refs.detilModelRef.edit(JSON.parse(JSON.stringify(record)))
+      }else{
+        this.designFlowStatusClick(record)
+      }
+    },
+    deleteLib(record){
+      let _this = this
+      this.$confirm({
+        content: _this.$t('ConfirmDelete'),
+        onOk() {
+          deleteAction('/project/problemManagementEO/deleteBatch', { ids: record.uuid }).then((res) => {
+            if (res.success) {
+              _this.$message.success(_this.$t('OperationSuccessful'))
+              _this.getList()
+            } else {
+              _this.$message.warning(res.message)
+            }
           })
         }
-      },
-      addModelForm(){
-        this.getList()
-      },
-      handleExport() {
-        let query = {
-          ...this.queryParam,
-          projectLibraryId: this.$route.query.id,
-          // ncrTrackVOList: this.content
+      })
+    },
+    handleExport() {
+      let query = {
+        ...this.queryParam,
+        ncrTrackVOList: this.content
+      }
+      downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+    },
+    Deselect() {
+      this.selectedRowKeys = []
+    },
+    PersonnelSelectionChange(value, id) {
+      this.queryParam[value] = id
+      this.queryParam = { ...this.queryParam }
+      console.log(this.queryParam)
+    },
+
+    //流程状态点击事件
+    designFlowStatusClick(row, name) {
+      let query = {}
+      let TaskKey = ''
+      let flowTypeName = ''
+      if (row.prcType == '2') {
+        if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+          TaskKey = 'zrrqr'
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
+          TaskKey = 'zrrtjjfw'
+        } else if (row.flowStatus == 'Results to be reviewed' ||
+          row.flowStatus == 'Compliance' ||
+          row.flowStatus == 'NA') {
+          TaskKey = 'fggcssh'
         }
-        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
-      },
-      tableOnChange(pagination, filters, sorter) {
-        this.orderBy = sorter.order == 'ascend' ? '1' : '2'
-        this.orderByField = sorter.columnKey
-        if (sorter.columnKey == 'serialNumber'){
-          this.orderByField = 'serial_number'
-        }else if(sorter.columnKey == 'flowTypeName'){
-          this.orderByField = 'flow_type'
-        }else if(sorter.columnKey == 'dutyTerritory_dictText'){
-          this.orderByField = 'duty_territory'
-        }else if(sorter.columnKey == 'flowStatusName'){
-          this.orderByField = 'flow_status'
-        }else if(sorter.columnKey == 'regulationOwnerIdName'){
-          this.orderByField = 'regulation_owner_id'
-        }else if(sorter.columnKey == 'dutyIdName'){
-          this.orderByField = 'duty_id'
-        }else{
-          this.orderByField = sorter.columnKey
+        query = {
+          actiProcInstId: row.prcId,
+          projectTaskInventoryId: row.projectLawsInventoryId,
+          projectLibraryId:row.projectLibraryId,
+          TaskKey: TaskKey,
+          isDisplay: false,
+          flowType: row.prcType,
+          Sponsor: 'regulationOwnerName',
+          personLiable: 'designDutyIdName',
+          typeOfDeliverables: 'designDeliverableTypeName',
+          deliverableTemplate: 'designDeliverableTemplate',
+          DueDate: 'designDueDate',
+          remarks: 'designRemark',
         }
-        this.getList()
-      },
-      getList() {
-        let query = {
-          pageNo: this.pageNo,
-          pageSize: this.pageSize,
-          projectLibraryId: this.$route.query.id,
-          orderBy: this.orderBy,
-          orderByField: this.orderByField,
-          ...this.queryParam
+        flowTypeName = this.$t('designComplianceProcess')
+      } else if(row.prcType == '4'){
+        if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
+          TaskKey = 'zrrqr'
+        } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' || row.flowStatus == 'To be tracked') {
+          TaskKey = 'zrrtjjfw'
+        } else if (row.flowStatus == 'Results to be reviewed' ||
+          row.flowStatus == 'Compliance' ||
+          row.flowStatus == 'NA') {
+          TaskKey = 'fggcssh'
         }
-        this.loading = true
-        getAction(this.url.page, query).then((res) => {
-          if (res.success) {
-            if (res.result.current > 1 && res.result.length == 0) {
-              this.pageNo = 1
-              this.getList()
-              return
-            }
-            this.total = res.result.total
-            this.loading = false
-          } else {
-            this.dataSource = []
-            this.loading = false
-          }
-        })
-      },
-      handleAdd(){
-        this.$refs.addModelRef.add()
-      },
-      edit(record){
-        this.$refs.addModelRef.edit(JSON.parse(JSON.stringify(record)))
-      },
-      detil(record){
-        this.problemTypeClick(record)
-      },
-      deleteLib(record){
-        let _this = this
-        this.$confirm({
-          content: _this.$t('ConfirmDelete'),
-          onOk() {
-            deleteAction(_this.url.deleteBatch, { id: record.id }).then((res) => {
-              if (res.success) {
-                _this.$message.success(_this.$t('OperationSuccessful'))
-                _this.getList()
-              } else {
-                _this.$message.warning(res.message)
-              }
-            })
-          }
-        })
-      },
-      problemTypeClick(row, name){
-        let query = {}
-        let TaskKey = ''
-        if (row.flowType == '2') {
-          if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
-            TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
-            TaskKey = 'zrrtjjfw'
-          } else if (row.flowStatus == 'Results to be reviewed' ||
-            row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'NA') {
-            TaskKey = 'fggcssh'
-          }
-          query = {
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.id,
-            projectLibraryId: this.$route.query.id,
-            TaskKey: TaskKey,
-            isDisplay: false,
-            flowType: row.flowType,
-            Sponsor: 'regulationOwnerName',
-            personLiable: 'designDutyIdName',
-            typeOfDeliverables: 'designDeliverableTypeName',
-            deliverableTemplate: 'designDeliverableTemplate',
-            DueDate: 'designDueDate',
-            remarks: 'designRemark',
-          }
-        } else if(row.flowType == '4'){
-          if (row.flowStatus == 'Task to be confirmed' || row.flowStatus == 'Duty Person Rejected') {
-            TaskKey = 'zrrqr'
-          } else if (row.flowStatus == 'Results to be submitted' || row.flowStatus == 'Non-Compliance' ||row.flowStatus == 'To be tracked') {
-            TaskKey = 'zrrtjjfw'
-          } else if (row.flowStatus == 'Results to be reviewed' ||
-            row.flowStatus == 'Compliance' ||
-            row.flowStatus == 'NA') {
-            TaskKey = 'fggcssh'
-          }
-          query = {
-            actiProcInstId: row.actiProcInstId,
-            projectTaskInventoryId: row.id,
-            projectLibraryId: this.$route.query.id,
-            TaskKey: TaskKey,
-            flowType: row.flowType,
-            isDisplay: false,
-            Sponsor: 'regulationOwnerName',
-            personLiable: 'verifyDutyIdName',
-            typeOfDeliverables: 'verifyDeliverableTypeName',
-            deliverableTemplate: 'verifyDeliverableTemplate',
-            DueDate: 'verifyDueDate',
-            remarks: 'verifyRemark',
-          }
+        query = {
+          actiProcInstId: row.prcId,
+          projectTaskInventoryId: row.projectLawsInventoryId,
+          projectLibraryId: row.projectLibraryId,
+          TaskKey: TaskKey,
+          flowType: row.prcType,
+          isDisplay: false,
+          Sponsor: 'regulationOwnerName',
+          personLiable: 'verifyDutyIdName',
+          typeOfDeliverables: 'verifyDeliverableTypeName',
+          deliverableTemplate: 'verifyDeliverableTemplate',
+          DueDate: 'verifyDueDate',
+          remarks: 'verifyRemark',
         }
-        this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), row.flowTypeName)
-      },
+        flowTypeName = this.$t('validationComplianceProcess')
+      }
+      this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), flowTypeName)
+    },
+    standardClick(val) {
+      let num = val.prcType
+      let query = {
+        taskIds: val.taskId,
+        projectTaskInventoryId: val.projectLawsInventoryId,
+        projectLibraryId: val.projectLibraryId,
+        projectName: val.projectName,
+        id: val.projectLibraryId,
+        serialNumber: val.serialNumber,
+        actiProcInstId: val.prcId,
+        primaryKeyId: val.projectTaskInventoryDetailId,
+        TaskKey: val.taskDefinitionKey,
+        isDisplay: val.status == 'NotDone' ? true : false
+      }
+      switch (num) {
+        case '2':
+          query.flowType = 2
+          query.Sponsor = 'designInitiatorName'
+          query.personLiable = 'designDutyName'
+          query.typeOfDeliverables = 'designDeliverableTypeName'
+          query.deliverableTemplate = 'designDeliverableTemplate'
+          query.DueDate = 'designDueDate'
+          query.remarks = 'designRemark'
+          break
+        case '3':
+          query.flowType = 3
+          query.Sponsor = 'prehomoInitiatorName'
+          query.personLiable = 'prehomoDutyName'
+          query.typeOfDeliverables = 'prehomoDeliverableTypeName'
+          query.deliverableTemplate = 'prehomoDeliverableTemplate'
+          query.DueDate = 'prehomoDueDate'
+          query.remarks = 'prehomoRemark'
+          break
+        case '4':
+          query.flowType = 4
+          query.Sponsor = 'verifyInitiatorName'
+          query.personLiable = 'verifyDutyName'
+          query.typeOfDeliverables = 'verifyDeliverableTypeName'
+          query.deliverableTemplate = 'verifyDeliverableTemplate'
+          query.DueDate = 'verifyDueDate'
+          query.remarks = 'verifyRemark'
+          break
+      }
+      let newUrl = this.$router.resolve({
+        path: '/taskListProcess',
+        query: query
+      })
+      window.open(newUrl.href, '_blank')
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  .box-title-text {
-    line-height: 1.4;
-    display: flex;
-    align-items: center;
-    margin-bottom: 10px;
-  }
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
 
-  .title-text {
-    width: 110px;
-    color: #000F16;
-    display: inline-block;
-    font-weight: 500;
-    font-size: 14px;
-    margin-right: 16px;
-    margin-top: 3px;
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
+.title-text {
+  width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 
-  .box-input {
-    display: inline-block;
-    width: calc(100% - 126px);
-    height: 38px;
-    margin-top: 2px;
-  }
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
 
-  .box-button {
-    height: 38px;
-    /*margin-top: 2px;*/
-  }
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
 
-  .page {
-    text-align: right;
-    margin-top: 20px;
-  }
-  .textName {
-    width: 100%;
-    overflow: hidden;
-    display: -webkit-box;
-    text-overflow: ellipsis;
-    /*! autoprefixer: off */
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 1;
-    /*! autoprefixer: on;*/
-    text-justify: inter-ideograph;
-    word-break: break-all
-  }
+.page {
+  text-align: right;
+  margin-top: 20px;
+}
+.box-content-Progress {
+  width: 78px;
+  height: 32px;
+  display: inline-block;
+  text-align: center;
+  line-height: 32px;
+  border-radius: 4px;
+  background: #f1f3f5;
+  color: #919399;
+}
+.accordColor {
+  background: #dbf6e2;
+  color: #26BD4B;
+}
 
-  /deep/.ant-table-thead > tr > th {
-    font-weight: bolder;
-  }
+.nonConformityColor {
+  background: #f3dddd;
+  color: #E83030;
+}
 
-  /*/deep/.ant-table-tbody > tr > td {*/
-  /*  color: #040B29 ;*/
-  /*}*/
+.TrackedColor {
+  background: #f6ebdb;
+  color: #FDA71C;
+}
+
+.notInvolvedColor {
+  background: #eef1f4;
+  color: #707486;
+}
+
+.submittedColor {
+  color: #00B3BE;
+  background: #ddf3f4;
+}
+.textName {
+  width: 100%;
+  overflow: hidden;
+  display: -webkit-box;
+  text-overflow: ellipsis;
+  /*! autoprefixer: off */
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  /*! autoprefixer: on;*/
+  text-justify: inter-ideograph;
+  word-break: break-all
+}
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 97fd7682f..fc0db405a 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -336,7 +336,7 @@
     },
     methods: {
       getNameList() {
-        getAction('project/projectNameInfoEO/list', {}).then((res) => {
+        getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
           if (res.success) {
             this.projectNameList = res.result || []
           } else {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index f9e8da0c5..a3ce7b1ee 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -231,6 +231,7 @@
                              style='width: 89%'
                              v-model='item.progressTracking'
                              :disabled="true"
+                             :title='item.progressTracking'
                              :placeholder="$t('PleaseEnter')+$t('progresstracking')"/>
                     <a @click="addprogresstrackingClick(index)" style='margin-left: 10px' v-if="formInline.progressTrackingList.length - 1 == index">{{$t('newlyAdded')}}</a>
                     <a @click="deleteprogresstrackingClick(index,item)" v-if="formInline.progressTrackingList.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
@@ -435,7 +436,7 @@ export default {
     //   this.$refs.addModelRef.addModel()
     // },
     getNameList() {
-      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
           this.projectNameList = res.result || []
         } else {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
index 465ac6547..7bbdc3fcd 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
@@ -66,6 +66,7 @@
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="creator">
                   <a-input class="box-input"
+                           :title='formInline.lawsName'
                            v-model='formInline.lawsName'
                            :disabled="disabled"/>
                 </a-form-model-item>
@@ -205,6 +206,7 @@
                     <a-input class="box-input"
                              style='width: 89%'
                              v-model='item.progressTracking'
+                             :title='item.progressTracking'
                              :disabled="true"/>
                   </div>
                 </a-form-model-item>
@@ -342,7 +344,7 @@ export default {
   },
   methods: {
     getNameList() {
-      getAction('project/projectNameInfoEO/list', {}).then((res) => {
+      getAction('/project/projectNameInfoEO/queryProjectNameList', {}).then((res) => {
         if (res.success) {
           this.projectNameList = res.result || []
         } else {