Merge pull request 'projects/mesxc-zjl' (#327) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #327
This commit is contained in:
		@@ -76,10 +76,6 @@ export default {
 | 
			
		||||
					name: this.chartData[i].objName + this.chartData[i].objCode,
 | 
			
		||||
					type: 'bar',
 | 
			
		||||
					barMaxWidth: 20,
 | 
			
		||||
					label: {
 | 
			
		||||
						show: true,
 | 
			
		||||
						position: 'top',
 | 
			
		||||
					},
 | 
			
		||||
					data: [],
 | 
			
		||||
				};
 | 
			
		||||
				legendData.push(this.chartData[i].objName + this.chartData[i].objCode);
 | 
			
		||||
 
 | 
			
		||||
@@ -68,9 +68,9 @@ export default {
 | 
			
		||||
 | 
			
		||||
			var option = {
 | 
			
		||||
				color: ['#288AFF'],
 | 
			
		||||
				// tooltip: {
 | 
			
		||||
				//   trigger: 'axis'
 | 
			
		||||
				// },
 | 
			
		||||
				tooltip: {
 | 
			
		||||
					trigger: 'axis',
 | 
			
		||||
				},
 | 
			
		||||
				grid: {
 | 
			
		||||
					left: '4%',
 | 
			
		||||
					right: '1%',
 | 
			
		||||
 
 | 
			
		||||
@@ -57,8 +57,10 @@ export default {
 | 
			
		||||
			let listObj = { useNum: '消耗量' }; // 数据
 | 
			
		||||
			for (let i = 0; i < arr.length; i++) {
 | 
			
		||||
				let obj = {};
 | 
			
		||||
				let fName = arr[i].time.slice(0, 4);
 | 
			
		||||
				let lName = arr[i].time.slice(4, 6);
 | 
			
		||||
				obj.prop = arr[i].time;
 | 
			
		||||
				obj.label = arr[i].time;
 | 
			
		||||
				obj.label = fName + ' 第 ' + lName + ' 周';
 | 
			
		||||
				obj.minWidth = 100;
 | 
			
		||||
				tempX.push(obj);
 | 
			
		||||
				listObj[arr[i].time] = arr[i].useNum || null;
 | 
			
		||||
 
 | 
			
		||||
@@ -45,6 +45,7 @@
 | 
			
		||||
			</el-table-column>
 | 
			
		||||
		</el-table>
 | 
			
		||||
		<el-button
 | 
			
		||||
			v-show="!isEdit"
 | 
			
		||||
			class="addButton"
 | 
			
		||||
			icon="el-icon-plus"
 | 
			
		||||
			@click="emitButtonClick">
 | 
			
		||||
@@ -70,6 +71,13 @@ export default {
 | 
			
		||||
				return [];
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
		isEdit: {
 | 
			
		||||
			type: Boolean,
 | 
			
		||||
			required: true,
 | 
			
		||||
			default: () => {
 | 
			
		||||
				return false;
 | 
			
		||||
			},
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
	data() {
 | 
			
		||||
		return {};
 | 
			
		||||
 
 | 
			
		||||
@@ -42,6 +42,7 @@
 | 
			
		||||
				<add-table
 | 
			
		||||
					:table-data="tableData"
 | 
			
		||||
					:table-name-list="tableNameList"
 | 
			
		||||
					:isEdit="isEdit"
 | 
			
		||||
					@emitFun="inputChange"
 | 
			
		||||
					@emitButtonClick="emitButtonClick" />
 | 
			
		||||
			</el-col>
 | 
			
		||||
 
 | 
			
		||||
@@ -66,7 +66,7 @@
 | 
			
		||||
						placeholder="请选择"
 | 
			
		||||
						style="width: 100%">
 | 
			
		||||
						<el-option
 | 
			
		||||
							v-for="item in getDictDatas(DICT_TYPE.TABLE_NAME)"
 | 
			
		||||
							v-for="item in tableNameList"
 | 
			
		||||
							:key="item.value"
 | 
			
		||||
							:label="item.label"
 | 
			
		||||
							:value="item.value"></el-option>
 | 
			
		||||
@@ -154,6 +154,7 @@ import {
 | 
			
		||||
	createEnergyLimit,
 | 
			
		||||
	getEnergyParamList,
 | 
			
		||||
} from '@/api/monitoring/energyLimit';
 | 
			
		||||
import { energyTableGet } from '@/api/base/energyQuantityManual';
 | 
			
		||||
export default {
 | 
			
		||||
	name: 'energyLimitAdd',
 | 
			
		||||
	props: {
 | 
			
		||||
@@ -203,6 +204,7 @@ export default {
 | 
			
		||||
					{ required: true, message: '指标类型不能为空', trigger: 'change' },
 | 
			
		||||
				],
 | 
			
		||||
			},
 | 
			
		||||
			tableNameList: [],
 | 
			
		||||
			detailList: [],
 | 
			
		||||
		};
 | 
			
		||||
	},
 | 
			
		||||
@@ -267,11 +269,22 @@ export default {
 | 
			
		||||
			}
 | 
			
		||||
		},
 | 
			
		||||
		toggleType() {
 | 
			
		||||
			if (this.form.energyTypeId && this.form.type) {
 | 
			
		||||
				this.getDetailList();
 | 
			
		||||
				this.form.plcParamId = '';
 | 
			
		||||
			if (this.form.energyTypeId && this.form.method == 2) {
 | 
			
		||||
				this.form.tableName = '';
 | 
			
		||||
				this.getTableNameList(this.form.energyTypeId);
 | 
			
		||||
			}
 | 
			
		||||
		},
 | 
			
		||||
		// 获取能源表名list
 | 
			
		||||
		getTableNameList(id) {
 | 
			
		||||
			energyTableGet({ energyTypeId: id }).then((res) => {
 | 
			
		||||
				this.tableNameList = res.data.tableObjs || [];
 | 
			
		||||
				if (this.tableNameList.length === 0) {
 | 
			
		||||
					this.$modal.msgWarning(
 | 
			
		||||
						'当前能源类型暂无配置表名,请先到《表名配置》页面配置'
 | 
			
		||||
					);
 | 
			
		||||
				}
 | 
			
		||||
			});
 | 
			
		||||
		},
 | 
			
		||||
		// 递归处理分类回显问题
 | 
			
		||||
		changeDetSelect(key, treeData) {
 | 
			
		||||
			let arr = []; // 递归时操作的数组
 | 
			
		||||
 
 | 
			
		||||
@@ -1,46 +1,52 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <el-switch v-model="state" type="text" size="small" :disabled="readonly" @change="changeHandler" />
 | 
			
		||||
	<el-switch
 | 
			
		||||
		v-hasPermi="['base:group-team:edit-worker']"
 | 
			
		||||
		v-model="state"
 | 
			
		||||
		type="text"
 | 
			
		||||
		size="small"
 | 
			
		||||
		:disabled="readonly"
 | 
			
		||||
		@change="changeHandler" />
 | 
			
		||||
</template>
 | 
			
		||||
 | 
			
		||||
<script>
 | 
			
		||||
export default {
 | 
			
		||||
  props: {
 | 
			
		||||
    injectData: {
 | 
			
		||||
      type: Object,
 | 
			
		||||
      default: () => ({})
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  data() {
 | 
			
		||||
    return {
 | 
			
		||||
      state: false
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  computed: {
 | 
			
		||||
    readonly() {
 | 
			
		||||
      return !!this.injectData.readonly
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  mounted() {
 | 
			
		||||
    this.mapToState()
 | 
			
		||||
  },
 | 
			
		||||
  methods: {
 | 
			
		||||
    mapToState() {
 | 
			
		||||
      if (this.injectData.prop === 'enabled') {
 | 
			
		||||
        this.state = this.injectData.enabled === 1 ? true : false
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    changeHandler() {
 | 
			
		||||
      let params = {}
 | 
			
		||||
      let payload = {}
 | 
			
		||||
      params.name = 'state'
 | 
			
		||||
      payload.id = this.injectData.id
 | 
			
		||||
      payload.enabled = this.state ? '1' : '0'
 | 
			
		||||
      payload.code = this.injectData.code
 | 
			
		||||
      payload.name = this.injectData.name
 | 
			
		||||
      payload.leaderId = this.injectData.leaderId
 | 
			
		||||
      params.payload = payload
 | 
			
		||||
      this.$emit('emitData', params)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
	props: {
 | 
			
		||||
		injectData: {
 | 
			
		||||
			type: Object,
 | 
			
		||||
			default: () => ({}),
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
	data() {
 | 
			
		||||
		return {
 | 
			
		||||
			state: false,
 | 
			
		||||
		};
 | 
			
		||||
	},
 | 
			
		||||
	computed: {
 | 
			
		||||
		readonly() {
 | 
			
		||||
			return !!this.injectData.readonly;
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
	mounted() {
 | 
			
		||||
		this.mapToState();
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
		mapToState() {
 | 
			
		||||
			if (this.injectData.prop === 'enabled') {
 | 
			
		||||
				this.state = this.injectData.enabled === 1 ? true : false;
 | 
			
		||||
			}
 | 
			
		||||
		},
 | 
			
		||||
		changeHandler() {
 | 
			
		||||
			let params = {};
 | 
			
		||||
			let payload = {};
 | 
			
		||||
			params.name = 'state';
 | 
			
		||||
			payload.id = this.injectData.id;
 | 
			
		||||
			payload.enabled = this.state ? '1' : '0';
 | 
			
		||||
			payload.code = this.injectData.code;
 | 
			
		||||
			payload.name = this.injectData.name;
 | 
			
		||||
			payload.leaderId = this.injectData.leaderId;
 | 
			
		||||
			params.payload = payload;
 | 
			
		||||
			this.$emit('emitData', params);
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
};
 | 
			
		||||
</script>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,41 +1,51 @@
 | 
			
		||||
<template>
 | 
			
		||||
  <div class="workerOperate">
 | 
			
		||||
    <div class="operateBtn">
 | 
			
		||||
      <span class="view" v-if="this.$auth.hasPermi('base:group-team:view-worker')" @click="emitParams('view')">查看</span>
 | 
			
		||||
      <span class="edit" v-if="this.$auth.hasPermi('base:group-team:edit-worker')" @click="emitParams('edit')">编辑</span>
 | 
			
		||||
    </div>
 | 
			
		||||
  </div>
 | 
			
		||||
	<div class="workerOperate">
 | 
			
		||||
		<div class="operateBtn">
 | 
			
		||||
			<span
 | 
			
		||||
				class="view"
 | 
			
		||||
				v-hasPermi="['base:group-team:view-worker']"
 | 
			
		||||
				@click="emitParams('view')">
 | 
			
		||||
				查看
 | 
			
		||||
			</span>
 | 
			
		||||
			<span
 | 
			
		||||
				class="edit"
 | 
			
		||||
				v-hasPermi="['base:group-team:edit-worker']"
 | 
			
		||||
				@click="emitParams('edit')">
 | 
			
		||||
				编辑
 | 
			
		||||
			</span>
 | 
			
		||||
		</div>
 | 
			
		||||
	</div>
 | 
			
		||||
</template>
 | 
			
		||||
<script>
 | 
			
		||||
export default {
 | 
			
		||||
  name: 'WorkerOperate',
 | 
			
		||||
  props: {
 | 
			
		||||
    injectData: {
 | 
			
		||||
      type: Object,
 | 
			
		||||
      default: () => ({})
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  methods: {
 | 
			
		||||
    emitParams(data) {
 | 
			
		||||
      let params = {}
 | 
			
		||||
      params.name = data
 | 
			
		||||
      params.payload = this.injectData
 | 
			
		||||
      this.$emit('emitData', params)
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
	name: 'WorkerOperate',
 | 
			
		||||
	props: {
 | 
			
		||||
		injectData: {
 | 
			
		||||
			type: Object,
 | 
			
		||||
			default: () => ({}),
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
	methods: {
 | 
			
		||||
		emitParams(data) {
 | 
			
		||||
			let params = {};
 | 
			
		||||
			params.name = data;
 | 
			
		||||
			params.payload = this.injectData;
 | 
			
		||||
			this.$emit('emitData', params);
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
};
 | 
			
		||||
</script>
 | 
			
		||||
<style lang='scss' scoped>
 | 
			
		||||
.workerOperate {
 | 
			
		||||
  .operateBtn{
 | 
			
		||||
    color: #0B58FF;
 | 
			
		||||
    .view {
 | 
			
		||||
      margin-right: 10px;
 | 
			
		||||
      cursor: pointer;
 | 
			
		||||
    }
 | 
			
		||||
    .edit {
 | 
			
		||||
      cursor: pointer;
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
	.operateBtn {
 | 
			
		||||
		color: #0b58ff;
 | 
			
		||||
		.view {
 | 
			
		||||
			margin-right: 10px;
 | 
			
		||||
			cursor: pointer;
 | 
			
		||||
		}
 | 
			
		||||
		.edit {
 | 
			
		||||
			cursor: pointer;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
</style>
 | 
			
		||||
@@ -125,7 +125,7 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: 'separate',
 | 
			
		||||
					type: this.$auth.hasPermi('base:group-team:create') ? 'separate' : '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:group-team:create') ? 'button' : '',
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -88,7 +88,7 @@ export default {
 | 
			
		||||
			workOrderList: [],
 | 
			
		||||
			workOrderName: '',
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:group-team-view:detail')
 | 
			
		||||
				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'detail',
 | 
			
		||||
							btnName: '详情',
 | 
			
		||||
 
 | 
			
		||||
@@ -97,7 +97,7 @@ export default {
 | 
			
		||||
			},
 | 
			
		||||
			tableProps,
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:team-production:detail')
 | 
			
		||||
				this.$auth.hasPermi('monitoring:group-team-scheduling:query')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'productionDetail',
 | 
			
		||||
							btnName: '查看',
 | 
			
		||||
 
 | 
			
		||||
@@ -173,12 +173,24 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:order-group:create')
 | 
			
		||||
					type: this.$auth.hasPermiAnd([
 | 
			
		||||
						'base:order-group:create',
 | 
			
		||||
						'base:core-product:query',
 | 
			
		||||
						'base:core-customer:query',
 | 
			
		||||
						'base:order:query',
 | 
			
		||||
					])
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:order-group:create') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermiAnd([
 | 
			
		||||
						'base:order-group:create',
 | 
			
		||||
						'base:core-product:query',
 | 
			
		||||
						'base:core-customer:query',
 | 
			
		||||
						'base:order:query',
 | 
			
		||||
					])
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '新增',
 | 
			
		||||
					name: 'add',
 | 
			
		||||
					color: 'success',
 | 
			
		||||
@@ -197,7 +209,10 @@ export default {
 | 
			
		||||
			tableProps,
 | 
			
		||||
			list: [],
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:bind')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order:query',
 | 
			
		||||
					'base:order-con-group-order:create',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'bind',
 | 
			
		||||
							btnName: '绑定',
 | 
			
		||||
@@ -214,7 +229,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:complete')
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'complete',
 | 
			
		||||
							btnName: '完成',
 | 
			
		||||
@@ -231,7 +246,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:termination')
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'termination',
 | 
			
		||||
							btnName: '终止',
 | 
			
		||||
@@ -248,7 +263,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:cancel')
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'cancel',
 | 
			
		||||
							btnName: '作废',
 | 
			
		||||
@@ -265,11 +280,17 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				{
 | 
			
		||||
					type: 'detail',
 | 
			
		||||
					btnName: '详情',
 | 
			
		||||
				},
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:edit')
 | 
			
		||||
				this.$auth.hasPermi('base:order-group:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'detail',
 | 
			
		||||
							btnName: '详情',
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order-group:update',
 | 
			
		||||
					'base:core-product:query',
 | 
			
		||||
					'base:core-customer:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'edit',
 | 
			
		||||
							btnName: '编辑',
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@
 | 
			
		||||
			<method-btn
 | 
			
		||||
				v-if="tableBtn.length"
 | 
			
		||||
				slot="handleBtn"
 | 
			
		||||
				:width="290"
 | 
			
		||||
				:width="250"
 | 
			
		||||
				label="操作"
 | 
			
		||||
				:method-list="tableBtn"
 | 
			
		||||
				@clickBtn="handleClick" />
 | 
			
		||||
@@ -169,12 +169,22 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:order-manage:create')
 | 
			
		||||
					type: this.$auth.hasPermiAnd([
 | 
			
		||||
						'base:order:query',
 | 
			
		||||
						'base:core-product:query',
 | 
			
		||||
						'base:order:create',
 | 
			
		||||
					])
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:order-manage:create') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermiAnd([
 | 
			
		||||
						'base:order:query',
 | 
			
		||||
						'base:core-product:query',
 | 
			
		||||
						'base:order:create',
 | 
			
		||||
					])
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '新增',
 | 
			
		||||
					name: 'add',
 | 
			
		||||
					color: 'success',
 | 
			
		||||
@@ -210,7 +220,14 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:bindWorkOrder')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order:update',
 | 
			
		||||
					'base:core-product:query',
 | 
			
		||||
					'base:production-line:query',
 | 
			
		||||
					'extend:process-flow:query',
 | 
			
		||||
					'base:core-work-order:query',
 | 
			
		||||
					'base:order:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'bind',
 | 
			
		||||
							btnName: '绑定',
 | 
			
		||||
@@ -227,7 +244,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:complete')
 | 
			
		||||
				this.$auth.hasPermi('base:order:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'complete',
 | 
			
		||||
							btnName: '完成',
 | 
			
		||||
@@ -244,7 +261,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:termination')
 | 
			
		||||
				this.$auth.hasPermi('base:order:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'termination',
 | 
			
		||||
							btnName: '终止',
 | 
			
		||||
@@ -261,7 +278,7 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:cancel')
 | 
			
		||||
				this.$auth.hasPermi('base:order:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'cancel',
 | 
			
		||||
							btnName: '作废',
 | 
			
		||||
@@ -278,13 +295,20 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:detail')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order:query',
 | 
			
		||||
					'extend:process-flow:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'detail',
 | 
			
		||||
							btnName: '详情',
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-manage:edit')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order:query',
 | 
			
		||||
					'base:core-product:query',
 | 
			
		||||
					'base:order:update',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'edit',
 | 
			
		||||
							btnName: '编辑',
 | 
			
		||||
 
 | 
			
		||||
@@ -181,7 +181,10 @@ export default {
 | 
			
		||||
			list: [],
 | 
			
		||||
			total: 0,
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:order:query',
 | 
			
		||||
					'extend:process-flow:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'orderDetail',
 | 
			
		||||
							btnName: '详情',
 | 
			
		||||
@@ -198,7 +201,11 @@ export default {
 | 
			
		||||
							},
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:order-completion-monitoring:qualityDet')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:quality-inspection-record:query',
 | 
			
		||||
					'base:core-product:query',
 | 
			
		||||
					'base:core-work-order:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'qualityDetail',
 | 
			
		||||
							btnName: '质量',
 | 
			
		||||
 
 | 
			
		||||
@@ -99,10 +99,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:voc:export') ? 'separate' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:voc:export') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '导出',
 | 
			
		||||
					name: 'export',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -103,10 +103,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:voc:create') ? 'separate' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:voc:create') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '新增',
 | 
			
		||||
					name: 'add',
 | 
			
		||||
					color: 'success',
 | 
			
		||||
@@ -124,13 +128,16 @@ export default {
 | 
			
		||||
			tableProps,
 | 
			
		||||
			list: [],
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:voc:update')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:environmental-check:update',
 | 
			
		||||
					'base:environmental-check:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'edit',
 | 
			
		||||
							btnName: '编辑',
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:voc:delete')
 | 
			
		||||
				this.$auth.hasPermi('base:environmental-check:delete')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'delete',
 | 
			
		||||
							btnName: '删除',
 | 
			
		||||
 
 | 
			
		||||
@@ -99,10 +99,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-gas:export') ? 'separate' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-gas:export') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '导出',
 | 
			
		||||
					name: 'export',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -103,10 +103,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-gas:create') ? 'separate' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-gas:create') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '新增',
 | 
			
		||||
					name: 'add',
 | 
			
		||||
					color: 'success',
 | 
			
		||||
@@ -124,13 +128,16 @@ export default {
 | 
			
		||||
			tableProps,
 | 
			
		||||
			list: [],
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:waste-gas:update')
 | 
			
		||||
				this.$auth.hasPermiAnd([
 | 
			
		||||
					'base:environmental-check:update',
 | 
			
		||||
					'base:environmental-check:query',
 | 
			
		||||
				])
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'edit',
 | 
			
		||||
							btnName: '编辑',
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:waste-gas:delete')
 | 
			
		||||
				this.$auth.hasPermi('base:environmental-check:delete')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'delete',
 | 
			
		||||
							btnName: '删除',
 | 
			
		||||
 
 | 
			
		||||
@@ -99,12 +99,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-water:export')
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-water:export') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check-record:export')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '导出',
 | 
			
		||||
					name: 'export',
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
 
 | 
			
		||||
@@ -103,12 +103,14 @@ export default {
 | 
			
		||||
					color: 'primary',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-water:create')
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'separate'
 | 
			
		||||
						: '',
 | 
			
		||||
				},
 | 
			
		||||
				{
 | 
			
		||||
					type: this.$auth.hasPermi('base:waste-water:create') ? 'button' : '',
 | 
			
		||||
					type: this.$auth.hasPermi('base:environmental-check:create')
 | 
			
		||||
						? 'button'
 | 
			
		||||
						: '',
 | 
			
		||||
					btnName: '新增',
 | 
			
		||||
					name: 'add',
 | 
			
		||||
					color: 'success',
 | 
			
		||||
@@ -126,13 +128,13 @@ export default {
 | 
			
		||||
			tableProps,
 | 
			
		||||
			list: [],
 | 
			
		||||
			tableBtn: [
 | 
			
		||||
				this.$auth.hasPermi('base:waste-water:update')
 | 
			
		||||
				this.$auth.hasPermi('base:environmental-check:update')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'edit',
 | 
			
		||||
							btnName: '编辑',
 | 
			
		||||
					  }
 | 
			
		||||
					: undefined,
 | 
			
		||||
				this.$auth.hasPermi('base:waste-water:delete')
 | 
			
		||||
				this.$auth.hasPermi('base:environmental-check:delete')
 | 
			
		||||
					? {
 | 
			
		||||
							type: 'delete',
 | 
			
		||||
							btnName: '删除',
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user