bug-fix

src/mixins/reportApproveConfig.js

@@ -27,7 +27,11 @@ export default{
         //是否开启了ETA审批流
         isETAApprove(){
             return this.IsReportApprove&&this.ReportApproveType==='eta'
-        }
+        },
+        //是否开启了接口审批
+        isOtherApprove(){
+            return this.IsReportApprove&&this.ReportApproveType==='other'
+        },
     },
     methods:{
         async getBaseConfig(){

src/views/report_manage/reportEn/reportlist.vue

@@ -76,10 +76,10 @@
                             clearable
                             style="width:100%;"
                         >
-                            <el-option label="未发布" :value="1"></el-option>
+                            <el-option label="未发布" :value="1" v-if="!isOtherApprove"></el-option>
                             <el-option label="已发布" :value="2"></el-option>
-                            <el-option label="待提交" :value="3"></el-option>
-                            <el-option label="待审批" :value="4"></el-option>
+                            <el-option label="待提交" :value="3" v-if="isApprove"></el-option>
+                            <el-option label="待审批" :value="4" v-if="isApprove"></el-option>
                             <el-option label="已驳回" :value="5"></el-option>
                             <el-option label="已通过" :value="6"></el-option>
                         </el-select>
@@ -534,7 +534,7 @@ export default {
             minwidthsty: 100
         },
         {
-            label: '报告状态',
+            label: '状态',
             key: 'State',
         },
         {

src/views/report_manage/reportlist.vue

@@ -92,10 +92,10 @@
                             style="width:100%;"
                             @change="search"
                         >
-                            <el-option label="未发布" :value="1"></el-option>
+                            <el-option label="未发布" :value="1" v-if="!isOtherApprove"></el-option>
                             <el-option label="已发布" :value="2"></el-option>
-                            <el-option label="待提交" :value="3"></el-option>
-                            <el-option label="待审批" :value="4"></el-option>
+                            <el-option label="待提交" :value="3" v-if="isApprove"></el-option>
+                            <el-option label="待审批" :value="4" v-if="isApprove"></el-option>
                             <el-option label="已驳回" :value="5"></el-option>
                             <el-option label="已通过" :value="6"></el-option>
                         </el-select>
@@ -217,14 +217,6 @@
             align="center"
             min-width="100"
           ></el-table-column>
-          <el-table-column label="发布状态" align="center" v-if="!isApprove">
-            <template slot-scope="scope">
-              <span v-if="scope.row.State == '2'" style="color: #46c371"
-                >已发布</span
-              >
-              <span v-if="scope.row.State == '1'">未发布</span>
-            </template>
-          </el-table-column>
           <el-table-column label="状态" align="center" v-if="isApprove">
             <template slot-scope="scope">
                 <span v-if="scope.row.State == '1'">未发布</span>

src/views/smartReport/reportList.vue

@@ -72,10 +72,10 @@
                                     style="width:100%;"
                                     @change="search"
                                 >
-                                    <el-option label="未发布" :value="1"></el-option>
+                                    <el-option label="未发布" :value="1" v-if="!isOtherApprove"></el-option>
                                     <el-option label="已发布" :value="2"></el-option>
-                                    <el-option label="待提交" :value="3"></el-option>
-                                    <el-option label="待审批" :value="4"></el-option>
+                                    <el-option label="待提交" :value="3" v-if="isApprove"></el-option>
+                                    <el-option label="待审批" :value="4" v-if="isApprove"></el-option>
                                     <el-option label="已驳回" :value="5"></el-option>
                                     <el-option label="已通过" :value="6"></el-option>
                                 </el-select>
@@ -183,15 +183,7 @@
                     align="center"
                     min-width="100"
                 ></el-table-column>
-                <el-table-column label="发布状态" align="center" v-if="!isApprove">
-                    <template slot-scope="scope">
-                    <span v-if="scope.row.State == '2'" style="color: #46c371"
-                        >已发布</span
-                    >
-                    <span v-if="scope.row.State == '1'">未发布</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="状态" align="center" v-if="isApprove">
+                <el-table-column label="状态" align="center">
                     <template slot-scope="scope">
                         <span v-if="scope.row.State == '1'">未发布</span>
                         <span v-if="scope.row.State == '2'">已发布</span>

src/views/system_manage/etaBaseConfig.vue

@@ -143,24 +143,26 @@
                         </template>
                     </div>
                     <!-- 研报审批 -->
-                    <div style="width:100%;margin-bottom: 20px;">
-                        <span style="color:#606266;">研报审批</span> 
-                        <el-switch v-model="approve"></el-switch>
-                    </div>
-                    <div class="side" v-if="approve">
-                        <el-form-item label="" prop="ReportApproveType">
-                            <el-radio-group v-model="formData.ReportApproveType">
-                                <el-radio label="eta">ETA内部审批</el-radio>
-                                <el-radio label="other">
-                                    <span>第三方审批</span>
-                                    <el-tooltip effect="dark" placement="top" content="中文研报(智能研报/研报列表)通过API接口对接第三方审批系统" >
-                                        <span class="hint-text">
-                                            <i class="el-icon-warning-outline"></i>
-                                        </span>
-                                    </el-tooltip>
-                                </el-radio>
-                            </el-radio-group>
-                        </el-form-item>
+                    <div v-if="isShowApprove">
+                        <div style="width:100%;margin-bottom: 20px;">
+                            <span style="color:#606266;">研报审批</span> 
+                            <el-switch v-model="approve"></el-switch>
+                        </div>
+                        <div class="side" v-if="approve">
+                            <el-form-item label="" prop="ReportApproveType">
+                                <el-radio-group v-model="formData.ReportApproveType">
+                                    <el-radio label="eta">ETA内部审批</el-radio>
+                                    <el-radio label="other">
+                                        <span>第三方审批</span>
+                                        <el-tooltip effect="dark" placement="top" content="中文研报(智能研报/研报列表)通过API接口对接第三方审批系统" >
+                                            <span class="hint-text">
+                                                <i class="el-icon-warning-outline"></i>
+                                            </span>
+                                        </el-tooltip>
+                                    </el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </div>
                     </div>
                 </div>
                 <div class="side">