Merge remote-tracking branch 'origin/master'

src/api/sys/ProofreadInfoService.js

@@ -8,11 +8,11 @@ export default class ProofreadInfoService {
       data: param
     })
   }
-  findById (id) {
+  findById (id, type) {
     return request({
       url: '/proofread/info/findById',
       method: 'get',
-      params: {id: id}
+      params: {id: id, type: type}
     })
   }
   list (type) {

src/views/modules/program/registered/ProofreadBrowseForm.vue

@@ -269,8 +269,8 @@
           detailFor70: []
         },
         yesOrNo: [
-          {value: 0, label: '否'},
-          {value: 1, label: '是'}
+          {value: 0, label: '×'},
+          {value: 1, label: '√'}
         ]
       }
     },
@@ -316,7 +316,7 @@
         this.loading = false
         this.$nextTick(() => {
           this.loading = true
-          this.proofreadInfoService.findById(id).then(({data}) => {
+          this.proofreadInfoService.findById(id, '2').then(({data}) => {
             if (!this.commonJS.isEmpty(data.projectId)) {
               this.$refs.inputForm.resetFields()
               this.inputForm = this.recover(this.inputForm, data)
@@ -353,6 +353,7 @@
             this.inputForm.detailFor50.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor60.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor70.forEach(item => { this.inputForm.details.push(item) })
+            this.inputForm.type = '2'
             this.proofreadInfoService.save(this.inputForm).then(({data}) => {
               this.close()
               this.$message.success(data)

src/views/modules/program/registered/ProofreadForm.vue

@@ -412,7 +412,7 @@
         this.loading = false
         this.$nextTick(() => {
           this.loading = true
-          this.proofreadInfoService.findById(id).then(({data}) => {
+          this.proofreadInfoService.findById(id, '1').then(({data}) => {
             if (!this.commonJS.isEmpty(data.projectId)) {
               this.$refs.inputForm.resetFields()
               this.inputForm = this.recover(this.inputForm, data)
@@ -453,6 +453,7 @@
             this.inputForm.detailFor2050.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor2060.forEach(item => { this.inputForm.details.push(item) })
             this.inputForm.detailFor30.forEach(item => { this.inputForm.details.push(item) })
+            this.inputForm.type = '1'
             this.proofreadInfoService.save(this.inputForm).then(({data}) => {
               this.close()
               this.$message.success(data)