diff --git a/jero-web/src/views/projectManagement/components/addModelconformance.vue b/jero-web/src/views/projectManagement/components/addModelconformance.vue
index de8ad4ea5..978ba4b47 100644
--- a/jero-web/src/views/projectManagement/components/addModelconformance.vue
+++ b/jero-web/src/views/projectManagement/components/addModelconformance.vue
@@ -53,7 +53,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="issue">
                   <a-input class="box-input"
-                           v-model='formInline.issue'
+                           v-model='formInline.psIssue'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+'PS-issue'"/>
                 </a-form-model-item>
@@ -64,49 +64,17 @@
             <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')"/>
-                </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('Relevantlawsregulations')">{{$t('Relevantlawsregulations')}}</span>
                 </div>
                 <a-form-model-item class="itemModel-multi" prop="creator">
                   <Standardselection
-                    :query="{'db_field_txt':$t('standard')}"
+                    :query="{'db_field_txt':$t('Relevantlawsregulations')}"
                     :standard="formInline"
                     :disabled="false"
                     @change="StandardselectionChange"
-                    v-model="formInline.serialNumber"/>
+                    v-model="formInline.lawsId"/>
                 </a-form-model-item>
               </div>
             </a-col>
@@ -120,7 +88,7 @@
                 <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"
@@ -130,7 +98,7 @@
                     <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>
@@ -156,7 +124,7 @@
                             class="box-input-search"
                             optionFilterProp="label"
                             :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                            v-model="formInline.firstLevelDutyTerritory">
+                            v-model="formInline.dutyTerritory">
                     <a-select-option v-for="(item, key) in firstLevelDutyTerritoryList"
                                      :key="key"
                                      :label="item.key"
@@ -179,7 +147,7 @@
                 <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
                             optionFilterProp="label"
@@ -208,7 +176,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="descriptions">
                   <a-input class="box-input"
-                           v-model='formInline.descriptions'
+                           v-model='formInline.description'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('descriptions')"/>
                 </a-form-model-item>
@@ -223,24 +191,24 @@
                     <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-form-model-item class="itemModel" prop="fileLink">
+                      <div v-for="(item,index) in formInline.fileLinkList" :key="index">
                         <a-input class="box-input"
                                  style='width: 89%'
-                                 v-model='item.xgwj'
+                                 v-model='item.fileLink'
                                  :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"
+                                v-if="formInline.fileLinkList.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;'
+                        <a-icon class="icon-text" v-if="formInline.fileLinkList.length > 1 && formInline.fileLinkList.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')
+                                @click="clickButtonToUpload('file')">
+                        {{ (formInline.file === 'null' || formInline.file === '' ||
+                        formInline.file == null) ? $t('Fileupload') : $t('viewUploadedFiles')
                         }}
                       </a-button>
                     </a-form-model-item>
@@ -256,15 +224,15 @@
                         :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">
+                  <div v-for="(item,index) in formInline.progressTrackingList" :key="index">
 <!--                    <span>{{item}}</span>-->
                     <a-input class="box-input"
                              style='width: 89%'
-                             v-model='item.text'
+                             v-model='item.progressTracking'
                              :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,item)" v-if="formInline.progresstrackinglist.length > 0" :disabled="disabled" style='margin-left: 10px' >{{$t('delete')}}</a>
+                    <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>
                   </div>
                 </a-form-model-item>
               </div>
@@ -278,9 +246,9 @@
                   <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'
+                           v-model='formInline.conclusion'
                            :disabled="disabled"
                            :placeholder="$t('PleaseEnter')+$t('conculsion')"/>
                 </a-form-model-item>
@@ -295,24 +263,24 @@
                   <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-form-model-item class="itemModel" prop="approvalEvidenceLink">
+                  <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
                     <a-input class="box-input"
                              style='width: 89%'
-                             v-model='item.xgwj'
+                             v-model='item.approvalEvidenceLink'
                              :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"
+                            v-if="formInline.approvalEvidenceLinkList.length - 1 == index"
                             type="plus"/>
-                    <a-icon class="icon-text" v-if="formInline.examineapproveevidencelist.length > 1 && formInline.examineapproveevidencelist.length - 1 !== index"
+                    <a-icon class="icon-text" v-if="formInline.approvalEvidenceLinkList.length > 1 && formInline.approvalEvidenceLinkList.length - 1 !== index"
                             style='margin-left: 10px;font-size: 18px;' @click="deletevidenceClick(index)"
                             type="minus"  :disabled="disabled"/>
                   </div>
                   <a-button type="primary" class="button-text"
-                            @click="clickButtonToUpload('accessory_id')">
-                    {{ (formInline.examineapproveevidence === 'null' || formInline.examineapproveevidence === '' ||
-                    formInline.examineapproveevidence == null) ? $t('Fileupload') : $t('viewUploadedFiles')
+                            @click="clickButtonToUpload('approvalEvidence')">
+                    {{ (formInline.approvalEvidence === 'null' || formInline.approvalEvidence === '' ||
+                    formInline.approvalEvidence == null) ? $t('Fileupload') : $t('viewUploadedFiles')
                     }}
                   </a-button>
                 </a-form-model-item>
@@ -346,9 +314,9 @@
                 <span class="title-text-text" :title="$t('progresstracking')">
                 {{$t('progresstracking')}}</span>
               </div>
-              <a-form-model-item class="itemModel" prop="text">
+              <a-form-model-item class="itemModel" prop="progressTracking">
                 <a-textarea :placeholder="$t('pleaseEnter')+$t('progresstracking')"
-                            v-model="formInlinetracking.text"
+                            v-model="formInlinetracking.progressTracking"
                             style="width: 90%"
                             :maxLength="500"
                             :rows="4"/>
@@ -370,7 +338,7 @@
 // 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'
 
@@ -406,7 +374,7 @@ export default {
       visible: false,
       visibletrack: false,
       rulestracking:{
-        text: [
+        progressTracking: [
           {
             required: true,
             message: this.$t('text') + this.$t('cannotEmpty'),
@@ -415,9 +383,9 @@ export default {
         ]
       },
       formInline: {
-        list:[{}],
-        examineapproveevidencelist:[{}],
-        progresstrackinglist:[{}]
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLink:[{}]
       },
       formInlinetracking:{},
       confirmLoading: false,
@@ -449,8 +417,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'
       }
     }
@@ -514,17 +482,16 @@ export default {
     },
     ...mapGetters(['userInfo']),
     add() {
-      console.log(this.userInfo())
       this.templateDisabled = false
       this.getNameList()
       this.getFirstLevelDutyTerritory()
-      this.title = this.$t('newlyAdded')
+      this.title = this.$t('newlyAdded1')
       this.visible = true
       this.disabled = false
       this.formInline = {
-        list:[{}],
-        examineapproveevidencelist:[{}],
-        progresstrackinglist:[{}]
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLink:[{}]
       }
       this.$nextTick(() => {
         this.formInline = { ...this.formInline }
@@ -544,19 +511,19 @@ export default {
       })
     },
     addClick(index){
-      this.formInline.list.splice(index + 1, 0, {})
+      this.formInline.fileLinkList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
     deleteClick(index) {
-      this.formInline.list.splice(index, 1)
+      this.formInline.fileLinkList.splice(index, 1)
       this.formInline = { ...this.formInline }
     },
     addvidenceClick(index){
-      this.formInline.examineapproveevidencelist.splice(index + 1, 0, {})
+      this.formInline.approvalEvidenceLinkList.splice(index + 1, 0, {})
       this.formInline = { ...this.formInline }
     },
     deletevidenceClick(index) {
-      this.formInline.examineapproveevidencelist.splice(index, 1)
+      this.formInline.approvalEvidenceLinkList.splice(index, 1)
       this.formInline = { ...this.formInline }
     },
     addprogresstrackingClick(index){
@@ -570,11 +537,11 @@ export default {
       })
     },
     deleteprogresstrackingClick(index,item) {
-      if(item.text && item.text != ''){
+      if(item.progressTracking && item.progressTracking != ''){
         if(index == 0){
-          item.text = ''
+          item.progressTracking = ''
         }else{
-          this.formInline.progresstrackinglist.splice(index, 1)
+          this.formInline.progressTrackingList.splice(index, 1)
         }
       }
       this.formInline = { ...this.formInline }
@@ -592,14 +559,14 @@ export default {
       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)
+          let text = this.userInfo().username + ' ' + time + ' ' + this.formInlinetracking.progressTracking
+          this.formInline.progressTrackingList.forEach((item,index) => {
+            console.log(item.progressTracking)
+            if(!item.progressTracking){
+              this.formInline.progressTrackingList.splice(0,1)
             }
           })
-          this.formInline.progresstrackinglist.splice(this.index+1, 1, {text:text})
+          this.formInline.progressTrackingList.splice(this.index+1, 1, {progressTracking:progressTracking})
           this.visibletrack = false
         }
       })
@@ -608,37 +575,26 @@ export default {
       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 = ''
+            let action = ''
             if (this.formInline.id) {
               url = this.url.edit
+              action = putAction
             } else {
               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 query = Object.assign(val, {
-              month: formInline.month,
-              memoriesChapter: formInline.memoriesChapter,
-              contentTemplate: formInline.contentTemplate,
-              memoriesChapterOne:formInline.memoriesChapterOne
-            })
-            postAction(url, query).then((res) => {
+            // Object.keys(formInline).forEach(res => {
+            //   if (formInline[res] && formInline[res] instanceof Array) {
+            //     formInline[res] = formInline[res].join(',')
+            //   }
+            // })
+            let query = {
+              problemManagementEO:formInline
+            }
+            action(url, query).then((res) => {
               if (res.success) {
                 this.$message.success(this.$t('OperationSuccessful'))
                 this.visible = false
@@ -649,7 +605,6 @@ export default {
                 this.$message.warning(this.$t('operationFailed'))
               }
             })
-          })
         }
       })
     }
diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue
index 2124d0419..16dff372d 100644
--- a/jero-web/src/views/projectManagement/components/nonConformance.vue
+++ b/jero-web/src/views/projectManagement/components/nonConformance.vue
@@ -8,8 +8,8 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
-                       v-model="queryParam.title"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+                       v-model="queryParam.title"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -17,8 +17,8 @@
               <div class="title-text" :title="$t('Relevantlawsregulations')">
                 <span>{{$t('Relevantlawsregulations')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Relevantlawsregulations')"
-                       v-model="queryParam.serialNumber"></j-input>
+              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('Relevantlawsregulations')"
+                       v-model="queryParam.lawsName"></a-input>
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
@@ -28,7 +28,7 @@
               </div>
               <a-select allowClear
                         class="box-input"
-                        v-model="queryParam.projectName"
+                        v-model="queryParam.projectId"
                         :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         showSearch
                         optionFilterProp="label"
@@ -37,7 +37,7 @@
                 <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>
@@ -75,7 +75,7 @@
                 </div>
                 <a-select allowClear
                           class="box-input"
-                          v-model="queryParam.flowType"
+                          v-model="queryParam.problemState"
                           :getPopupContainer="triggerNode=> triggerNode.parentNode"
                           showSearch
                           optionFilterProp="label"
@@ -209,15 +209,14 @@
           {
             title: this.$t('title'),
             align: 'left',
-            dataIndex: 'serialNumber',
+            dataIndex: 'title',
             width: 170,
-            sorter:true,
-            scopedSlots: { customRender: 'standard' }
+            sorter:true
           },
           {
             title: this.$t('Relevantlawsregulations'),
             align: 'left',
-            dataIndex: 'title',
+            dataIndex: 'lawsName',
             width: 170,
             sorter:true,
             ellipsis: true
@@ -225,7 +224,7 @@
           {
             title: this.$t('RelatedItems'),
             align: 'left',
-            dataIndex: 'RelatedItems',
+            dataIndex: 'projectName',
             width: 170,
             sorter:true,
             ellipsis: true
@@ -258,7 +257,7 @@
           {
             title: this.$t('Problemstate'),
             align: 'left',
-            dataIndex: 'Problemstate',
+            dataIndex: 'problemState',
             width: 120,
             sorter:true,
             ellipsis: true
@@ -288,8 +287,6 @@
         total: 0,
         pageSize: 10,
         pageNo: 1,
-        orderBy: '1',
-        orderByField: '',
         long: '',
         isPersonnelSelection:true,
         url: {
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
index de8ad4ea5..69fbd5d5b 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/addModel.vue
@@ -60,38 +60,38 @@
               </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')"/>
-                </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">-->
+<!--&lt;!&ndash;                  <span class="Required">*</span>&ndash;&gt;-->
+<!--                  <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">-->
+<!--                  &lt;!&ndash;                  <span class="Required">*</span>&ndash;&gt;-->
+<!--                  <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')"/>-->
+<!--                </a-form-model-item>-->
+<!--              </div>-->
+<!--            </a-col>-->
+<!--          </a-row>-->
           <a-row :gutter="24">
             <a-col :span="12">
               <div class="box-title-text">