diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
index 5a0367166..97fd7682f 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue
@@ -137,17 +137,17 @@
 <!--        </span>-->
         <div slot="CertificationProgress" slot-scope="text,result">
              <span v-if="result.problemState == $t('red')" class="box-content-Progress box-content-cou nonConformityColor"
-                   :style="{'width':long=='zh-cn'?'116px' : '148px'}"
+                   :style="{'width':long=='zh-cn'?'90px' : '120px'}"
              >
               {{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'?'116px' : '148px'}"
+                :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'?'116px' : '148px'}"
+                :style="{'width':long=='zh-cn'?'90px' : '120px'}"
           >
               {{result.problemState ? result.problemState : ''}}
              </span>
@@ -426,7 +426,7 @@
       },
       detil(record){
         if(record.flag == 'NEW'){
-          this.$refs.detilModelRef.check(JSON.parse(JSON.stringify(record)))
+          this.$refs.detilModelRef.edit(JSON.parse(JSON.stringify(record)))
         }else{
           this.designFlowStatusClick(record)
         }
@@ -614,7 +614,7 @@
     margin-top: 20px;
   }
   .box-content-Progress {
-    width: 88px;
+    width: 78px;
     height: 32px;
     display: inline-block;
     text-align: center;
diff --git a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
index 2272baf87..ab46a8f98 100644
--- a/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
+++ b/jero-web/src/views/projectManagement/projectNonConformance/moudles/detilModel.vue
@@ -10,6 +10,7 @@
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <a-spin :spinning="confirmLoading">
+        <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
           <a-row :gutter="24">
             <a-col :span="24">
               <div class="box-title-text">
@@ -17,7 +18,11 @@
                   <span class="title-text-text"
                         :title="$t('title')">{{$t('title')}}</span>
                 </div>
-                <span>{{formInline.title}}</span>
+                <a-form-model-item class="itemModel" prop="title">
+                  <a-input class="box-input"
+                           v-model='formInline.title'
+                           :disabled="disabled"/>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -25,38 +30,15 @@
             <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>
-                <span>{{formInline.problemType}}</span>
-<!--                <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')"-->
-<!--                                     :type="'select'"-->
-<!--                                     :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>-->
-<!--                </a-form-model-item>-->
-              </div>
-            </a-col>
-            <a-col :span="12">
-              <div class="box-title-text">
-                <div class="title-text">
-                  <span class="title-text-text"
-                        :title="'PS-issue'">{{'PS-issue'}}</span>
-                </div>
-                <span>{{formInline.psIssue}}</span>
-              </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>
-                <span>{{formInline.creator}}</span>
+                <a-form-model-item class="itemModel-multi" prop="problemType">
+                  <j-dict-select-tag class="box-input" v-model="formInline.problemType"
+                                     :disabled="disabled"
+                                     :type="'select'"
+                                     :triggerChange="false" :dictCode="'wen4_ti2_lei4_xing2'"/>
+                </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
@@ -64,9 +46,13 @@
                 <div class="title-text">
                   <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text"
-                        :title="$t('createTime')">{{$t('createTime')}}</span>
+                        :title="'PS-issue'">{{'PS-issue'}}</span>
                 </div>
-                <span>{{formInline.createTime}}</span>
+                <a-form-model-item class="itemModel" prop="issue">
+                  <a-input class="box-input"
+                           v-model='formInline.psIssue'
+                           :disabled="disabled"/>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -78,7 +64,11 @@
                   <span class="title-text-text"
                         :title="$t('Relevantlawsregulations')">{{$t('Relevantlawsregulations')}}</span>
                 </div>
-                <span>{{formInline.lawsName}}</span>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <a-input class="box-input"
+                           v-model='formInline.lawsName'
+                           :disabled="disabled"/>
+                </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
@@ -88,7 +78,26 @@
                   <span class="title-text-text"
                         :title="$t('RelatedItems')">{{$t('RelatedItems')}}</span>
                 </div>
-                <span>{{formInline.projectId}}</span>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.projectId"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            mode="multiple"
+                            :disabled="disabled"
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false">
+                    <a-select-option v-for="(item, key) in projectNameList"
+                                     :key="key"
+                                     :label="item.projectName"
+                                     :value="item.id">
+                     <span style="display: inline-block;width: 100%" :title=" item.projectName ">
+                           {{ item.projectName}}
+                     </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -100,7 +109,26 @@
                   <span class="title-text-text"
                         :title="$t('statisticalNodes')">{{$t('statisticalNodes')}}</span>
                 </div>
-                <span>{{formInline.dutyTerritory}}</span>
+                <a-form-model-item class="itemModel-multi" prop="creator">
+                  <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"
+                                     :value="item.key">
+                               <span style="display: inline-block;width: 100%" :title=" item.key ">
+                                     {{ item.key }}
+                               </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
               </div>
             </a-col>
             <a-col :span="12">
@@ -110,7 +138,25 @@
                   <span class="title-text-text"
                         :title="$t('Problemstate')">{{$t('Problemstate')}}</span>
                 </div>
-                <span>{{formInline.problemState}}</span>
+                <a-form-model-item class="itemModel" prop="contentTemplate">
+                  <a-select allowClear
+                            class="box-input"
+                            v-model="formInline.problemState"
+                            :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                            showSearch
+                            :disabled="disabled"
+                            optionFilterProp="label"
+                            :autoClearSearchValue="false">
+                    <a-select-option v-for="(item, key) in ProblemstateList"
+                                     :label='item'
+                                     :key="key"
+                                     :value="item">
+                  <span style="display: inline-block;width: 100%" :title=" item">
+                    {{ item }}
+                  </span>
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -118,46 +164,50 @@
             <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>
-                <span>{{formInline.descriptions}}</span>
+                <a-form-model-item class="itemModel" prop="descriptions">
+                  <a-input class="box-input"
+                           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="title-text-text"
+                        :title="$t('documents')">{{$t('documents')}}</span>
+                </div>
+                <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 >{{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('documents')">{{$t('documents')}}</span>
-                  </div>
-                      <div v-for="(item,index) in formInline.fileLinkList" :key="index">
-                        <span>{{item.fileLink}}</span>
-                      </div>
-                      <span>{{formInline.fileLink}}</span>
-                      <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>
-                </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.progressTracking}}</span>
+                    <a-input class="box-input"
+                             style='width: 89%'
+                             v-model='item.progressTracking'
+                             :disabled="true"/>
                   </div>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -165,11 +215,14 @@
             <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>
-                <span>{{formInline.conclusion}}</span>
+                <a-form-model-item class="itemModel" prop="conclusion">
+                  <a-input class="box-input"
+                           v-model='formInline.conclusion'
+                           :disabled="disabled"/>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
@@ -181,48 +234,72 @@
                   <span class="title-text-text"
                         :title="$t('examineapproveevidence')">{{$t('examineapproveevidence')}}</span>
                 </div>
+                <a-form-model-item class="itemModel" prop="approvalEvidenceLink">
                   <div v-for="(item,index) in formInline.approvalEvidenceLinkList" :key="index">
-                    <span>{{item.approvalEvidenceLink}}</span>
+                    <a @click='UserFeedback(item.approvalEvidenceLink)'>{{item.approvalEvidenceLink}}</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>
+                  <div v-for='(item,index) in formInline.approvalEvidenceFileList'>
+                    <a >{{item.fileName}}</a>
+                  </div>
+                </a-form-model-item>
               </div>
             </a-col>
           </a-row>
+        </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>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
   </div>
 </template>
 
 <script>
-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: {
-    uploadFile,
+
   },
   data() {
     return {
+      rules: {
+        title: [
+          {
+            required: true,
+            message: this.$t('title') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ],
+        problemType: [
+          {
+            required: true,
+            message: this.$t('problemType') + this.$t('cannotEmpty'),
+            trigger: 'change'
+          }
+        ],
+      },
       visible: false,
       visibletrack: false,
+      rulestracking:{
+        progressTracking: [
+          {
+            required: true,
+            message: this.$t('text') + this.$t('cannotEmpty'),
+            trigger: 'blur'
+          }
+        ]
+      },
       formInline: {
-        list:[{}],
-        examineapproveevidencelist:[{}],
-        progresstrackinglist:[{}]
+        fileLinkList:[{}],
+        progressTrackingList:[{}],
+        approvalEvidenceLinkList:[{}],
+        dutyTerritory:undefined,
+        projectId:undefined,
+        problemState:undefined,
       },
       formInlinetracking:{},
       confirmLoading: false,
@@ -232,48 +309,90 @@ export default {
       chapterContentsList: [],
       firstLevelDutyTerritoryList:[],
       projectNameList: [],
+      ProblemstateList:[this.$t('red'),this.$t('yellow'),this.$t('green'),],
+      templateDisabled: false,
+      contentTemplateList: [
+        {
+          id: '1',
+          text: this.$t('defaultTemplate')
+        },
+        {
+          id: '2',
+          text: this.$t('newRequestCommentListTemplate')
+        },
+        {
+          id: '3',
+          text: this.$t('NewReleasedStandardTemplate')
+        },
+        {
+          id: '4',
+          text: this.$t('industryInformationDynamicTemplate')
+        }
+      ],
       index:'',
+      url: {
+        add: '/project/problemManagementEO/add',
+        edit: '/project/problemManagementEO/edit',
+        queryById: '/report/lawsMonthlyReportWriteEO/queryById'
+      }
     }
   },
   mounted() {
 
   },
   methods: {
-    clickButtonToUpload(item) {
-      this.$refs.uploadFile.perentHandleFunc()
-      this.$refs.uploadFile.visible = true
-      this.uploadName = item
-      getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+    getNameList() {
+      getAction('project/projectNameInfoEO/list', {}).then((res) => {
         if (res.success) {
-          this.$refs.uploadFile.perentHandleFunc(res.result)
+          this.projectNameList = res.result || []
         } else {
-          this.$refs.uploadFile.perentHandleFunc()
+          this.projectNameList = []
         }
       })
     },
-    /** 上传文件的回调 */
-    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 }
+    getFirstLevelDutyTerritory() {
+      getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => {
+        if (res.success) {
+          this.firstLevelDutyTerritoryList = res.result
+        } else {
+          this.firstLevelDutyTerritoryList = []
+        }
+      })
     },
     ...mapGetters(['userInfo']),
-    check(row) {
-      this.title = this.$t('edit')
-      getAction('/project/problemManagementEO/queryById', {id:row.id}).then((res) => {
+    edit(row) {
+      this.getNameList()
+      this.getFirstLevelDutyTerritory()
+      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) {
-          console.log(res.result)
-          this.formInline = res.result
-          this.visible = true
-          this.disabled = false
+          this.formInline.fileList = res.result.fileList
+          this.formInline.approvalEvidenceFileList = res.result.approvalEvidenceFileList
         }
       })
+      console.log(this.formInline)
+      this.visible = true
+      this.disabled = true
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate()
+      })
+    },
+    UserFeedback(item){
+      window.open(item, '_blank');
     },
     handleCancel() {
       this.visible = false