src/components/base-dialog/addOrUpdate/index.vue

@@ -113,6 +113,7 @@
 import CKEditor from 'ckeditor4-vue'
 import AttrForm from '../AttrForm'
 import { pick } from 'lodash/object'
+import { pick as __pick } from '@/utils/filters'
 import i18n from '@/i18n'
 // 标题 for i18n
 const title = {
@@ -344,6 +345,11 @@ export default {
 		},
 
 		getPlaceholder(n, c) {
+			if (this.isDetail) {
+				/** 如果是详情，就不展示 提示文本 */
+				return ''
+			}
+
 			const opt = this.configs.fields[(n - 1) * COLUMN_PER_ROW + (c - 1)]
 			if (opt) {
 				// if opt is valid
@@ -392,9 +398,10 @@ export default {
 					}).then(({ data: res }) => {
 						if (res && res.code === 0) {
 							const dataFormKeys = Object.keys(this.dataForm)
+							// console.log('keys ===> ', dataFormKeys)
 							// console.log('data form keys: ', dataFormKeys, pick(res.data, dataFormKeys))
-							this.dataForm = pick(res.data, dataFormKeys)
+							this.dataForm = __pick(res.data, dataFormKeys)
-
+							// console.log('pick(res.data, dataFormKeys) ===> ', __pick(res.data, dataFormKeys))
 							// LABEL: FILE_RELATED
 							/** 对文件下载进行分流 */
 							this.fileList = {}

src/utils/filters.js

@@ -10,3 +10,15 @@ export const dictFilter = dictTypeId => {
 export const timeFilter = (val) => {
 	return moment(val).format('YYYY-MM-DD HH:mm:ss')
 }
+
+export const pick = (obj, paths) => {
+	let result = {}
+	paths.forEach(key => {
+		if (obj.hasOwnProperty(key)) {
+			result[key] = obj[key];
+		} else {
+			result[key] = null
+		}
+	})
+	return result
+}

src/views/modules/monitoring/equipment.vue

@@ -120,6 +120,7 @@ const addOrUpdateConfigs = {
 		{
 			name: 'sort',
 			label: i18n.t('ws.sort'),
+			type: 'number',
 			rules: [{ type: 'number', message: i18n.t('hints.number'), trigger: 'blur', transform: val => Number(val) }]
 		},
 		{
@@ -308,7 +309,7 @@ export default {
 		handleDestroyDialog() {
 			setTimeout(() => {
 				this.addOrUpdateVisible = false
-			}, /** after dialog animated */ 200);
+			}, /** after dialog animated */ 200)
 		},
 		// 获取产线列表，用于刷新工段列表
 		getPlList() {

src/views/modules/monitoring/qualityInspectionCurrent.vue

@@ -78,7 +78,7 @@ const tableConfigStatic = [
 ]
 const tableConfigDynamic = [
 	{ type: 'index', width: 100, name: i18n.t('index') },
-	{ name: i18n.t('inspect.type'), prop: 'inspectionContent' },
+	{ name: i18n.t('inspect.det'), prop: 'inspectionContent' },
 	/** dynamic */
 	{ name: i18n.t('inspect.typetotal'), prop: '' },
 	{ name: i18n.t('inspect.rate'), prop: '' }
@@ -282,7 +282,7 @@ export default {
 
 			this.tableConfigDynamic = [
 				{ type: 'index', width: 100, name: i18n.t('index') },
-				{ name: i18n.t('inspect.type'), prop: 'inspectionContent' },
+				{ name: i18n.t('inspect.det'), prop: 'inspectionContent' },
 				...subProps,
 				{ name: i18n.t('inspect.typetotal'), prop: 'sumInput' },
 				{ name: i18n.t('inspect.rate'), prop: 'scrapRatio', filter: val => (val || val === 0 ? `${val}%` : '-') }

src/views/modules/monitoring/qualityInspectionDet.vue

@@ -55,7 +55,7 @@ const addOrUpdateConfigs = {
 	fields: [
 		{ name: 'typeId', label: i18n.t('inspect.type'), required: true, type: 'select', options: [] },
 		{ name: 'content', label: i18n.t('inspect.det'), required: true },
-		{ name: 'code', label: i18n.t('inspect.detcode'), api: '/monitoring/qualityInspectionDet/getCode' },
+		{ name: 'code', label: i18n.t('inspect.code'), api: '/monitoring/qualityInspectionDet/getCode' },
 		'remark'
 	],
 	operations: [

src/views/modules/monitoring/workshopSectionDialog.vue

@@ -42,7 +42,15 @@
 					<!-- <el-button type="text" v-if="!showAttrForm" @click="addEq">{{ $t('add') }}</el-button> -->
 				</h3>
 				<div class="table" v-if="!showAttrForm">
-					<base-table :page="page" :size="limit" :data="eqList" :table-head-configs="tableProps" :max-height="calcMaxHeight(8)" @operate-event="handleOperations" @refreshDataList="getDataList" />
+					<base-table
+						:page="page"
+						:size="limit"
+						:data="eqList"
+						:table-head-configs="tableProps"
+						:max-height="calcMaxHeight(8)"
+						@operate-event="handleOperations"
+						@refreshDataList="getDataList"
+					/>
 					<el-pagination
 						@size-change="sizeChangeHandle"
 						@current-change="currentChangeHandle"
@@ -78,7 +86,7 @@ const tableProps = [
 		name: i18n.t('index')
 	},
 	{ name: i18n.t('eq.name'), prop: 'equipmentName' },
-	{ name: i18n.t('dept.sort'), prop: 'sort' },
+	{ name: i18n.t('dept.sort'), prop: 'sort' }
 	// {
 	// 	name: i18n.t('handle'),
 	// 	prop: 'operations',