优化

src/views/reportManagement/components/template/customTemplate.vue

@@ -89,27 +89,10 @@ export default {
       const keys = []
       this.customs.map(item => {
         if (e.type < 4) {
-          if (item.conditions === `${e.fieldKey}_${e.content}`) {
-            item.bool = true
-            item.bools = true
-          } else {
-            if (item.conditions.split('_')[0] === e.fieldKey) {
-              item.bool = false
-              delete item.bools
-            }
-          }
+          item.conditions === `${e.fieldKey}_${e.content}` ? item.bool = true : ''
         } else if (e.type === 4) {
           e.contents.map(i => {
-            if (item.conditions === `${e.fieldKey}_${i}`) {
-              item.bool = true
-              item.bools = true
-            } else {
-              if (item.conditions.split('_')[0] === e.fieldKey) {
-                item.bool = false
-                delete item.bools
-              }
-            }
-            // item.conditions === `${e.fieldKey}_${i}` ? item.bool = true : ''
+            item.conditions === `${e.fieldKey}_${i}` ? item.bool = true : ''
           })
         }
       })

src/views/reportManagement/testPresentation.vue

@@ -9,9 +9,15 @@
           <span style="min-width: 70px;">{{ title }}</span>
           <el-input v-if="history" v-model="screenForm.reportName" size="small" filterable placeholder="报告名称搜索" style="width:100%;" @change="history ? getList(screenForm.reportName) : gethistoryData(screenForm.reportName)" />
         </div>
-        <div v-if="history && title !== '测试日报'" class="Layout_space_between">
+        <div v-if="history && title !== '测试日报' && title !== '提测报告'" class="Layout_space_between">
           <span style="min-width: 70px;">通过状态</span>
           <el-select v-model="screenForm.passStatus" size="medium" clearable filterable placeholder="请选择" style="width:100%;" @change="getList(screenForm.passStatus)">
+            <el-option v-for="item in reportStatusLists" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </div>
+         <div v-if="history && title !== '测试日报' && title !== '准出报告'" class="Layout_space_between">
+           <span style="min-width: 70px;">通过状态</span>
+          <el-select v-model="screenForm.status" size="medium" clearable filterable placeholder="请选择" style="width:100%;" @change="getList(screenForm.status)">
             <el-option v-for="item in reportStatusList" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </div>
@@ -164,7 +170,8 @@ export default {
       title: '测试日报', // 报告title
       history: true, // 新老数据
       isDelayList: [{ code: 0, name: '未延期' }, { code: 1, name: '延期' }],
-      reportStatusList: [{ code: 0, name: '通过' }, { code: 1, name: '打回' }],
+      reportStatusLists: [{ code: 0, name: '通过' }, { code: 1, name: '打回' }],
+      reportStatusList: [{ code: 1, name: '通过' }, { code: 2, name: '打回' }],
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       message: {}, // 老日报数据
@@ -183,6 +190,7 @@ export default {
       screenForm: {
         reportName: '',
         passStatus: '',
+        status: '',
         isDelay: ''
       },
       restaurants: [],
@@ -246,12 +254,14 @@ export default {
           break
         case 1:
           this.title = '准出报告'
-          this.reportStatusList = [{ code: 0, name: '通过' }, { code: 1, name: '不通过' }]
+          this.screenForm = { ...this.screenForm, status: '', passStatus: '' }
+          this.reportStatusLists = [{ code: 0, name: '通过' }, { code: 1, name: '不通过' }]
           this.history ? this.getList() : this.gethistoryData()
           break
         case 2:
           this.title = '提测报告'
-          this.reportStatusList = [{ code: 0, name: '通过' }, { code: 1, name: '打回' }]
+          this.screenForm = { ...this.screenForm, status: '', passStatus: '' }
+          this.reportStatusList = [{ code: 1, name: '通过' }, { code: 2, name: '打回' }]
           this.history ? this.getList() : this.gethistoryData()
           break
       }