修改

src/views/modules/deductiondetails/DeductionDetailsForm.vue

@@ -52,13 +52,23 @@
            </el-form-item>
         </el-col>
         <el-col :span="12">
-            <el-form-item v-if="inputForm.veto != 1" label="扣分" prop="deductPoints"
+            <el-form-item v-if="inputForm.veto != 1 && inputForm.subClassId!=='324d659b184b40068f9524848729070f' && inputForm.subClassId!=='6f3134f09f404a0db5c7f3ccf9830993'"  label="扣分" prop="deductPoints"
                 :rules="[
                   {required: true,  message:'扣分分数不为空', trigger:'blur'},
                   {validator: isNumberZero, trigger:'blur'}
                  ]">
               <el-input type="number" v-model="inputForm.deductPoints" placeholder="请填写扣分"     ></el-input>
            </el-form-item>
+
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="inputForm.veto != 1 && (inputForm.subClassId=='324d659b184b40068f9524848729070f' || inputForm.subClassId=='6f3134f09f404a0db5c7f3ccf9830993')" label="加分" prop="deductPoints"
+                        :rules="[
+                    {required: true,  message:'加分分数不为空', trigger:'blur'},
+                    {validator: isNumberZero2, trigger:'blur'}
+                   ]">
+            <el-input type="number" v-model="inputForm.deductPoints" placeholder="请填写加分"     ></el-input>
+          </el-form-item>
         </el-col>
         <el-col :span="12">
             <el-form-item label="扣分详情" prop="deductionDetails"
@@ -129,6 +139,19 @@
             }
           })
         },
+        isNumberZero2: (rule, value, callback) => {
+          const reg = /^[-]?[1-9]+$/
+          if (!reg.test(value)) {
+            return callback(new Error('情输入正确的加分分数'))
+          }
+          this.$http.get(`/database/datalink/dataSource/checkEnName?oldEnName=${this.inputForm.oldEnName}&enName=${value}`).then(({data}) => {
+            if (!data.success) {
+              return callback(new Error('连接英文名已存在!'))
+            } else {
+              return callback()
+            }
+          })
+        },
         inputForm: {
           id: '',
           yearOfEvaluation: '',
@@ -197,8 +220,6 @@
                 url: `/deductiondetails/deductionDetails/getSubClass?id=${this.inputForm.classId}`,
                 method: 'get'
               }).then(({data}) => {
-                console.log('111')
-                console.log(data)
                 this.subClass = data.subClass
                 this.loading = false
               })
@@ -238,7 +259,6 @@
           url: `/deductiondetails/deductionDetails/getSubClass?id=${this.inputForm.classId}`,
           method: 'get'
         }).then(({data}) => {
-          console.log(data)
           this.subClass = data.subClass
           this.inputForm.subClassId = ''
           this.loading = false
@@ -250,7 +270,6 @@
           url: `/deductiondetails/deductionDetails/getVeto?id=${this.inputForm.subClassId}`,
           method: 'get'
         }).then(({data}) => {
-          console.log(data)
           this.veto = data.veto
           this.inputForm.veto = '0'
           this.loading = false

src/views/modules/deductiondetails/DeductionDetailsList.vue

@@ -53,6 +53,7 @@
               icon="el-icon-search"
               @click="isSearchCollapse = !isSearchCollapse, isImportCollapse=false">
             </el-button>
+          <el-button v-if="hasPermission('deductiondetails:deductionDetails:export')" type="default" size="small" icon="el-icon-download" title="导出" @click="exportExcel()"></el-button>
             <el-button
               type="default"
               size="small"
@@ -338,7 +339,7 @@
         this.$utils.download('/deductiondetails/deductionDetails/import/template')
       },
       exportExcel () {
-        this.$utils.download('/deductiondetails/deductionDetails/export')
+        this.$utils.download('/deductiondetails/deductionDetails/export?yearOfEvaluation=' + this.searchForm.yearOfEvaluation)
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()

src/views/modules/deductionshowdetails/DeductionShowDetailsList.vue

@@ -390,7 +390,21 @@
         this.$utils.download('/deductionshowdetails/deductionShowDetails/import/template')
       },
       exportExcel () {
-        this.$utils.download('/deductionshowdetails/deductionShowDetails/export')
+        var yearOfEvaluation = this.searchForm.yearOfEvaluation
+        var id = this.searchForm.id
+        var unitId = this.searchForm.unitId
+        var classId = this.searchForm.classId
+        var subClassId = this.searchForm.subClassId
+        var unitName = this.searchForm.unitName
+        var subClass = this.searchForm.subClass
+        this.$utils.download('/deductionShowDetails/deductionShowDetails/export' +
+          '?yearOfEvaluation=' + yearOfEvaluation +
+          '&id=' + id +
+          '&unitId=' + unitId +
+          '&classId=' + classId +
+          '&subClassId=' + subClassId +
+          '&unitName=' + unitName +
+          '&subClass=' + subClass)
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()