Merge branch 'yh228'

src/components/lzTable.vue

@@ -12,7 +12,7 @@
 					:style="{color:item=='IsStop' && data.IsStop?'#F56C6C':'#333333'}">
 					<template v-if="source!=='baiinfo'">
 						<template v-if="item=='IsStop'">
-							{{ refreshStatusMap.get(data[item]) }}
+							{{data.IsSupplierStop==0?refreshStatusMap.get(data[item]):data.IsSupplierStop==1?refreshStatusMap.get(2):''}}
 						</template>
 						<template v-else>
 							{{
@@ -178,7 +178,8 @@ export default {
 		refreshStatusMap(){
 			return new Map([
 				[0,this.$t('SystemManage.DataRefresh.enabled')],
-				[1,this.$t('SystemManage.DataRefresh.disabled')]
+				[1,this.$t('SystemManage.DataRefresh.disabled')],
+				[2,this.$t('SystemManage.DataRefresh.supplier_disable')]
 			])
 		}
 	},

src/lang/modules/systemManage/DataRefresh.js

@@ -51,6 +51,7 @@ export const DataRefreshZh = {
   table_refresh_status:"刷新状态",
   enabled:"启用",
   disabled:"停用",
+  supplier_disabled:"供应商停用",
 
   reference_time:"引用时间",
   reference_source:"引用来源",
@@ -74,6 +75,7 @@ export const DataRefreshZh = {
   status_setting_tab:"刷新状态设置",
   enable:"启用",
   disable:"停用",
+  supplier_disable:'供应商停用',
 
   default_refresh_rule:"默认刷新规则",
   set_default_refresh_rule:"设置默认刷新规则",
@@ -133,6 +135,7 @@ export const DataRefreshEn = {
   table_refresh_status:"Refresh Status",
   enabled:"Enabled",
   disabled:"Disabled",
+  supplier_disable:'Supplier Disable',
   
   reference_time:"Reference Time",
   reference_source:"Reference Source",

src/views/dataEntry_manage/databaseComponents/chartTrendRender.vue

@@ -114,7 +114,7 @@
 					</el-radio-group>
 				</div>
 			</div>
-			<img src="~@/assets/img/icons/edb-stopping.png" class="stop-mark" v-if="([2,34].includes(chartInfo.Source) || chartInfo.EdbType==2) && chartInfo.NoUpdate==1" />
+			<img src="~@/assets/img/icons/edb-stopping.png" class="stop-mark" v-if="([2,34].includes(chartInfo.Source) || chartInfo.EdbType==2) && ( chartInfo.IsSupplierStop==1 || (chartInfo.IsSupplierStop==0&&chartInfo.NoUpdate==1))" />
 		</div>
 		<div class="table-data">
 

src/views/dataEntry_manage/databaseList.vue

@@ -240,11 +240,11 @@
 							<div class="info">
 								{{$t('EtaBasePage.time_show')}}：{{item.CreateTime.substring(0,10)}}
 								<!-- wind和钢联化工的指标、计算指标显示 启用/停用-->
-								<span v-if="([2,34].includes(item.Source) || item.EdbType==2) && isEdbBtnShow('enableOrDisable')" 
+								<span v-if="([2,34].includes(item.Source) || item.EdbType==2) && isEdbBtnShow('enableOrDisable')&&item.IsSupplierStop!=1" 
 								class="enable-toggle-btn" :style="{'color': item.NoUpdate==1?'#0052D9':'#D54941'}"
 								@click="toggleEdbRefreshStatus(item)">{{item.NoUpdate==1?$t('SystemManage.DataRefresh.enable'):$t('SystemManage.DataRefresh.disable') }}</span>
 							</div>
-							<img src="~@/assets/img/icons/edb-stopping.png" class="stop-mark" v-if="([2,34].includes(item.Source) || item.EdbType==2) && item.NoUpdate==1" />
+							<img src="~@/assets/img/icons/edb-stopping.png" class="stop-mark" v-if="([2,34].includes(item.Source) || item.EdbType==2) && ( item.IsSupplierStop==1 || (item.IsSupplierStop==0&&item.NoUpdate==1))" />
 						</div>
 					</div>
 					
@@ -264,7 +264,7 @@
 							</el-tab-pane>
 						</el-tabs>
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
-							<el-button v-if="([2,34].includes(EdbData.Source) || EdbData.EdbType==2) && isEdbBtnShow('enableOrDisable')" 
+							<el-button v-if="([2,34].includes(EdbData.Source) || EdbData.EdbType==2) && isEdbBtnShow('enableOrDisable')&&EdbData.IsSupplierStop!=1" 
 								type="text" :style="{'color': EdbData.NoUpdate==1?'#0052D9':'#D54941'}"
 								@click="toggleEdbRefreshStatus(EdbData,'detail')" 
 							>{{EdbData.NoUpdate==1?$t('SystemManage.DataRefresh.enable'):$t('SystemManage.DataRefresh.disable') }}<!-- 启用/停用 --></el-button>

src/views/system_manage/dataRefreshSetting.vue

@@ -149,6 +149,7 @@
                         class="select-item-small" clearable>
                             <el-option :label="$t('SystemManage.DataRefresh.enable')" value="启用"/>
                             <el-option :label="$t('SystemManage.DataRefresh.disable')" value="暂停"/>
+                            <el-option v-if="searchParams.Source===34" :label="$t('SystemManage.DataRefresh.supplier_disabled')" value="供应商停用"/>
                         </el-select>
                         <!-- 频度 -->
                         <el-select :placeholder="$t('SystemManage.DataRefresh.table_frequency')" class="select-item-small"
@@ -231,14 +232,16 @@
                     </el-table-column>
                     <el-table-column align="center" prop="IsStop" :label="$t('SystemManage.DataRefresh.table_refresh_status')">
                         <template slot-scope="scope">
-                            {{scope.row.IsStop?  $t('SystemManage.DataRefresh.disabled'):$t('SystemManage.DataRefresh.enabled') }}
+                            {{scope.row.IsSupplierStop==1?$t('SystemManage.DataRefresh.supplier_disabled'):scope.row.IsStop?  $t('SystemManage.DataRefresh.disabled'):$t('SystemManage.DataRefresh.enabled') }}
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="Operation" :label="$t('Table.column_operations')">
                         <template slot-scope="scope">
-                            <span class="table-text-button" v-if="scope.row.IsStop" @click="enableToggle(scope.row)">{{$t('SystemManage.DataRefresh.enable')}}</span>
-                            <!-- v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_del" -->
-                            <span class="table-text-button" style="color: #C54322;" @click="enableToggle(scope.row)" v-else>{{$t('SystemManage.DataRefresh.disable')}}</span>
+                            <template v-if="scope.row.IsSupplierStop!=1">
+                                <span class="table-text-button" v-if="scope.row.IsStop" @click="enableToggle(scope.row)">{{$t('SystemManage.DataRefresh.enable')}}</span>
+                                <!-- v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_del" -->
+                                <span class="table-text-button" style="color: #C54322;" @click="enableToggle(scope.row)" v-else>{{$t('SystemManage.DataRefresh.disable')}}</span>
+                            </template>
                         </template>
                     </el-table-column>
                 </el-table>