From 90964e8f07b9ad3cb2c5f34c8784d7e2c32974fd Mon Sep 17 00:00:00 2001
From: zhaowei
Date: 星期一, 08 七月 2024 14:57:55 +0800
Subject: [PATCH] 1、标准加工时间页面取消设备层面字段展示以及取消选择左侧设备树 2、加工数量管理页面新增添加表格记录时的设备选择功能
---
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue | 20
src/views/mdc/base/MdcStandardProcessTime.vue | 770 +++++++++++++++++++++++++++++++++++-----
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue | 19
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue | 16
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue | 216 ++++++----
src/views/system/modules/SelectDeviceDrawer.vue | 1
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue | 14
src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue | 28
src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue | 2
9 files changed, 839 insertions(+), 247 deletions(-)
diff --git a/src/views/mdc/base/MdcStandardProcessTime.vue b/src/views/mdc/base/MdcStandardProcessTime.vue
index 998ad66..0726d36 100644
--- a/src/views/mdc/base/MdcStandardProcessTime.vue
+++ b/src/views/mdc/base/MdcStandardProcessTime.vue
@@ -1,139 +1,709 @@
<template>
- <div style="width: 100%; height: 100%;">
- <a-card :bordered="false">
- <a-row type="flex" :gutter="16">
- <a-col :md="5">
- <a-tabs :activeKey="activeKey" @change="tabChange">
- <a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
- <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
- </a-tab-pane>
- <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
- </a-tab-pane>
- </a-tabs>
- </a-col>
- <a-col :md="19">
- <mdc-standard-process-duration-list ref="MdcStandardProcessDurationList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></mdc-standard-process-duration-list>
- </a-col>
- </a-row>
- </a-card>
- </div>
+ <a-card :bordered="false" class="device_list">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24" style="width: 100%;">
+ <a-col :md="5" :sm="5">
+ <a-form-item label="闆朵欢鍙�">
+ <a-input placeholder="杈撳叆闆朵欢鍙锋煡璇�" v-model="queryParams.partsCode"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="5" :sm="5" :xs="5">
+ <a-form-item label="绋嬪簭鍙�">
+ <a-input placeholder="杈撳叆绋嬪簭鍙锋煡璇�" v-model="queryParams.sequenceNumber"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :md="2" :sm="2" :xs="2">
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator" style="display: inline;">
+ <a-button @click="handleAdd" type="primary" icon="plus">鏂板
+ </a-button>
+ <a-button type="primary" icon="download" @click="importTemplate('鏍囧噯鍔犲伐鏃堕棿妯℃澘')">瀵煎叆妯℃澘</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('鏍囧噯鍔犲伐鏃堕棿')">瀵煎嚭</a-button>
+ <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+ @change="handleImportExcel">
+ <a-button type="primary" icon="import">瀵煎叆</a-button>
+ </a-upload>
+ <a-button type="primary" icon="printer" v-print="'#DeviceList'" v-has="'standardProcessDuration:print'">鎵撳嵃
+ </a-button>
+ <a-dropdown v-if="selectedRowKeys.length > 0">
+ <a-menu slot="overlay">
+ <a-menu-item key="1" @click="batchDel">
+ <a-icon type="delete"/>
+ 鍒犻櫎
+ </a-menu-item>
+ </a-menu>
+ <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔
+ <a-icon type="down"/>
+ </a-button>
+ </a-dropdown>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div id="DeviceList" style="flex: 1;overflow: hidden">
+ <a-table ref="table" bordered size="middle" rowKey="id" :columns="columns"
+ :scroll="{x:'max-content',y:465}" :dataSource="dataSource" :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ @change="handleTableChange">
+ <span slot="action" slot-scope="text, record">
+ <a @click="handleEdit(record)">缂栬緫</a>
+ <a-divider type="vertical"/>
+ <a @click="handleDelete(record.id)">鍒犻櫎</a>
+ </span>
+ <!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
+ <span slot="num" slot-scope="text" style="font-weight: bold">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="name" slot-scope="text" style="font-weight: bold">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ <span slot="model" slot-scope="text" style="font-weight: bold">
+ <j-ellipsis :value="text" :length="8"/>
+ </span>
+ </a-table>
+ </div>
+ <!-- table鍖哄煙-end -->
+ <!--<device-repair-model></device-repair-model>-->
+ <mdc-standard-process-duration-modal ref="modalForm" @ok="modalFormOk"></mdc-standard-process-duration-modal>
+ <mdc-standard-process-duration-edit ref="modalFormedit" @ok="modalFormOk"></mdc-standard-process-duration-edit>
+
+ </a-card>
</template>
<script>
- import { putAction, getAction } from '@/api/manage'
- import { frozenBatch } from '@/api/api'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import $ from 'jquery'
+ import JDictSelectTag from '@/components/dict/JDictSelectTag'
+ import {
+ requestPut,
+ deleteAction,
+ downFile,
+ getAction
+ } from '@/api/manage'
+ import MdcStandardProcessDurationModal from './modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal'
+ import MdcStandardProcessDurationEdit from './modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit'
+ import '@/components/table2excel/table2excel'
+ import {
+ JeecgListMixin
+ } from '@/mixins/JeecgListMixin'
import JInput from '@/components/jeecg/JInput'
- import BaseTree from '../common/BaseTree'
- import MdcStandardProcessDurationList from './modules/mdcStandardProcessDuration/MdcStandardProcessDurationList'
- import JSuperQuery from '@/components/jeecg/JSuperQuery'
- import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
- import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
- import {mapActions} from 'vuex'
+ import JEllipsis from '@/components/jeecg/JEllipsis'
+ import Tooltip from 'ant-design-vue/es/tooltip'
+ import { ajaxGetDictItems, getDictItemsFromCache, duplicateCheck } from '@/api/api'
+
export default {
- name: 'mdcStandardProcessDuration',
+ name: 'MdcStandardProcessDurationList',
+ mixins: [JeecgListMixin],
components: {
- JThirdAppButton,
+ Tooltip,
+ MdcStandardProcessDurationModal,
+ MdcStandardProcessDurationEdit,
+ JDictSelectTag,
JInput,
- BaseTree,
- JSuperQuery,
- DepartTree,
- MdcStandardProcessDurationList
+ JEllipsis
},
+ props: { nodeTree: '', Type: '', nodePeople: '' },
data() {
return {
- activeKey: '1',
- description: '璁惧淇℃伅',
- selectEquementId: '',
- selectEquement: {},
- selectPeople:{},
- slectTypeTree:"",
- url: {
- equipmentStatistics: '/mdc/equipment/equipmentStatistics'
+ typeTree: '',
+ typeParent: 1,
+ typeEquipment: 1,
+ xianshi: '',
+ readOnly: true,
+ queryParam: {},
+ queryParams: {},
+ queryParamEquip: {},
+ queryParamPeople: {},
+ dataStartsoucre: [],
+ scrollY: 465,
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
},
- isDepartType:'',
+ columns: [
+ {
+ title: '闆朵欢鍙�',
+ align: 'center',
+ dataIndex: 'partsCode',
+ width: 300
+ },
+ {
+ title: '鎵规鍙�',
+ align: 'center',
+ dataIndex: 'batchCode',
+ width: 300
+ },
+ {
+ title: '绋嬪簭鍙�',
+ align: 'center',
+ dataIndex: 'sequenceNumber',
+ width: 300
+ },
+ {
+ title: '鏃堕暱锛堝垎閽燂級',
+ align: 'center',
+ dataIndex: 'duration',
+ width: 300
+ },
+ {
+ title: '澶囨敞',
+ align: 'center',
+ dataIndex: 'remark',
+ width: 420
+ },
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ scopedSlots: { customRender: 'action' },
+ align: 'center',
+ fixed: 'right',
+ width: 150
+ }
+ ],
+ url: {
+ list: '/mdc/mdcStandardProcessDuration/list',
+ delete: '/mdc/mdcStandardProcessDuration/delete',
+ deleteBatch: '/mdc/mdcStandardProcessDuration/deleteBatch',
+ getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
+ exportXlsUrl: '/mdc/mdcStandardProcessDuration/exportXls',
+ importExcelUrl: '/mdc/mdcStandardProcessDuration/importExcel'
+ }
}
},
- created() {
- this.queryTreeData()
+ watch: {
+ Type(valmath) {
+ this.dataList = []
+ this.queryParams.typeTree = valmath
+ },
+ nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
+ if (JSON.stringify(val) != '{}') {
+ if (val.equipmentId) {
+ this.queryParamEquip.parentId = ''
+ this.queryParams.equipmentId = val.equipmentId
+ this.queryParamEquip.equipmentId = val.equipmentId
+ } else {
+ this.queryParamEquip.parentId = val.key
+ this.queryParams.equipmentId = ''
+ }
+ this.searchQuery()
+ }
+ },
+ nodePeople(val) {
+ if (JSON.stringify(val) != '{}') {
+ if (val.equipmentId) {
+ this.queryParamEquip.parentId = ''
+ this.queryParams.equipmentId = val.equipmentId
+ this.queryParamEquip.equipmentId = val.equipmentId
+ } else {
+ this.queryParamPeople.parentId = val.key
+ this.queryParams.equipmentId = ''
+ }
+ this.searchQuery()
+ }
+ }
+ },
+ computed: {
+ importExcelUrl: function() {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ }
},
methods: {
- ...mapActions(['QueryDepartTree']),
- queryTreeData() {
- this.QueryDepartTree().then(res => {
- if (res.success) {
- this.isDepartType = res.result[0].value
+ importTemplate(fileName) {
+ var a = document.createElement('a')
+ a.href = '/static/鏍囧噯鍔犲伐鏃堕棿.xls'
+ a.download = '鏍囧噯鍔犲伐鏃堕棿.xls'
+ a.style.display = 'none'
+ document.body.appendChild(a)
+ a.click()
+ a.remove()
+ },
+ searchReset() {
+ if (this.queryParams.typeTree == '1') {
+ this.typeTree = this.queryParams.typeTree
+ this.typeParent = this.queryParams.parentId
+ this.typeEquipment = this.queryParams.equipmentId
+ this.queryParams = {}
+ this.queryParam = {}
+ this.dates = []
+ this.queryParams.typeTree = this.typeTree
+ this.queryParams.parentId = this.typeParent
+ if (this.queryParams.parentId != '') {
+ this.queryParams.equipmentId = ''
} else {
- // this.$message.warn(res.message)
- this.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
+ if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) {
+ this.queryParams.equipmentId = this.typeEquipment
+ } else {
+ this.queryParams.equipmentId = this.queryParamEquip.equipmentId
+ }
+
}
- }).finally(() =>{
+
+ this.ipagination.current = 1
+ this.ResetloadData()
+ } else {
+ this.typeTree = this.queryParams.typeTree
+ this.typeParent = this.queryParams.parentId
+ // this.typeEquipment = this.queryParams.equipmentId
+ this.queryParams = {}
+ this.queryParam = {}
+ this.dates = []
+ this.queryParams.typeTree = this.typeTree
+ this.queryParams.parentId = this.typeParent
+ // this.queryParams.equipmentId = this.typeEquipment
+ this.ipagination.current = 1
+ this.ResetloadData()
+ }
+
+ },
+ ResetloadData() {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ if (!params) {
+ return false
+ }
+ params.typeTree = this.queryParams.typeTree
+ params.parentId = this.queryParams.parentId
+ params.equipmentId = this.queryParams.equipmentId
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records || res.result
+ // this.initDeviceType(this.dataSource)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ // this.dataSource = res.result.records||res.result;
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
})
},
- tabChange(val) {
- // console.log(val);
- this.activeKey = val
- this.slectTypeTree = val
+ handleEdit: function(record) {
+ this.$refs.modalFormedit.edit(record)
+ this.$refs.modalFormedit.title = '缂栬緫'
+ this.$refs.modalFormedit.disableSubmit = false
},
- // changeSelection(val) {
- // this.selectEquementId = val
- // this.$refs.efficiencyList.pQuery(val)
- // this.$refs.efficiencyList.searchQuery()
- // },
- changeSelectionNode(val) {
- this.selectEquement = val
- this.slectTypeTree = "1"
+ handleTableChange(pagination, filters, sorter) {
+ this.dataSource = []
+ //鍒嗛〉銆佹帓搴忋�佺瓫閫夊彉鍖栨椂瑙﹀彂
+ //TODO 绛涢��
+ // console.log(pagination)
+ if (Object.keys(sorter).length > 0) {
+ this.isorter.column = sorter.field
+ this.isorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+ }
+ this.ipagination = pagination
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if (this.superQueryParams) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParams, this.isorter, this.filters)
+ param.pageNo = this.ipagination.current
+ param.pageSize = this.ipagination.pageSize
+ param.field = this.getQueryField()
+ param.parentId = this.queryParams.parentId
+ param.equipmentId = this.queryParams.equipmentId
+ param.startTime = this.queryParam.startTime
+ param.endTime = this.queryParam.endTime
+ getAction(this.url.list, param).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
},
- changeSelectionNodedd(val) {
- this.selectPeople = val
- this.slectTypeTree = "2"
- }
- }
+ searchQueryEdit() {
+ if (this.queryParams.typeTree == '1') {
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ } else {
+ this.queryParams.parentId = this.queryParamPeople.parentId
+ this.queryParams.equipmentIds = ''
+ }
+ this.dataSource = []
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if (this.superQueryParams) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParams, this.isorter, this.filters)
+ param.pageNo = this.ipagination.current
+ param.pageSize = this.ipagination.pageSize
+ param.field = this.getQueryField()
+ param.parentId = this.queryParams.parentId
+ param.equipmentId = this.queryParams.equipmentId
+ param.startTime = this.queryParam.startTime
+ param.endTime = this.queryParam.endTime
+ getAction(this.url.list, param).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ searchQuery() {
+ if (this.queryParams.typeTree == '1') {
+ this.queryParams.parentId = this.queryParamEquip.parentId
+ // this.queryParams.equipmentId = this.queryParamEquip.equipmentId
+ } else {
+ this.queryParams.parentId = this.queryParamPeople.parentId
+
+ // this.queryParams.equipmentId = ""
+ }
+ this.dataSource = []
+ //鑾峰彇鏌ヨ鏉′欢
+ let sqp = {}
+ if (this.superQueryParams) {
+ sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParams, this.isorter, this.filters)
+ param.pageNo = 1
+ param.pageSize = this.ipagination.pageSize
+ param.field = this.getQueryField()
+ param.parentId = this.queryParams.parentId
+ param.equipmentId = this.queryParams.equipmentId
+ param.startTime = this.queryParam.startTime
+ param.endTime = this.queryParam.endTime
+ // console.log(param);
+ getAction(this.url.list, param).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records || res.result
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ loadData(arg) {
+ if (!this.url.list) {
+ this.$message.error('璇疯缃畊rl.list灞炴��!')
+ return
+ }
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1
+ }
+ var params = this.getQueryParams()//鏌ヨ鏉′欢
+ if (!params) {
+ return false
+ }
+ this.loading = true
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ this.dataSource = res.result.records || res.result
+ // this.initDeviceType(this.dataSource)
+ //update-begin---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ // this.dataSource = res.result.records||res.result;
+ if (res.result.total) {
+ this.ipagination.total = res.result.total
+ } else {
+ this.ipagination.total = 0
+ }
+ //update-end---author:zhangyafei Date:20201118 for锛氶�傞厤涓嶅垎椤电殑鏁版嵁鍒楄〃------------
+ } else {
+ // this.$message.warning(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ this.loading = false
+ })
+ },
+ modalFormOk(val) {
+ // 鏂板/淇敼 鎴愬姛鏃讹紝閲嶈浇鍒楄〃
+ this.searchQueryEdit()
+ // this.$emit('openBasetree','')
+ this.selectedRowKeys = []
+ },
+ handleDelete: function(id) {
+ if (!this.url.delete) {
+ this.$message.error('璇疯缃畊rl.delete灞炴��!')
+ return
+ }
+ var that = this
+ deleteAction(that.url.delete, { id: id }).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(1)
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.searchQuery()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
+ batchDel: function() {
+ if (!this.url.deleteBatch) {
+ this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
+ return
+ }
+ if (this.selectedRowKeys.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒');
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇烽�夋嫨涓�鏉¤褰�'
+ })
+ return
+ } else {
+ var ids = ''
+ for (var a = 0; a < this.selectedRowKeys.length; a++) {
+ ids += this.selectedRowKeys[a] + ','
+ }
+ var that = this
+ this.$confirm({
+ title: '纭鍒犻櫎',
+ content: '鏄惁鍒犻櫎閫変腑鏁版嵁?',
+ onOk: function() {
+ that.loading = true
+ deleteAction(that.url.deleteBatch, { ids: ids }).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(that.selectedRowKeys.length)
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ that.onClearSelected()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
+ }
+ },
+ handleAdd() {
+ this.$refs.modalForm.add(this.node)
+ this.$refs.modalForm.title = '鏂板'
+ this.$refs.modalForm.disableSubmit = false
+ },
+ handleAddXIU() {
+ this.$refs.modalFormadd.add()
+ this.$refs.modalFormadd.title = '鏂板'
+ this.$refs.modalFormadd.disableSubmit = false
+ },
+ pQuery(parentId) {
+ this.queryParam.parentId = parentId[0]
+ if (this.selectedRowKeys.length >= 1) {
+ this.selectedRowKeys.length = 0
+ }
+ this.loadData()
+ },
+ onSelectChange(selectedRowKeys) {
+ this.selectedRowKeys = selectedRowKeys
+ },
+ initEquipment(id) {
+ let _this = this
+ getAction(this.url.getEquipmentByPid, { pid: id }).then((res) => {
+ if (res.success) {
+ if (res.result) {
+ _this.$set(this.queryParams, 'equipmentName', res.result.equipmentName)
+ _this.$set(this.queryParams, 'equipmentId', res.result.equipmentId)
+ _this.equipment = res.result
+ _this.searchQuery()
+ } else {
+ // _this.$message.warning('璇烽厤缃澶囷紒')
+ _this.$notification.warning({
+ message: '娑堟伅',
+ description: '璇疯仈绯荤鐞嗗憳锛屽紑鏀捐澶囨潈闄愶紒'
+ })
+ }
+ }
+ })
+ },
+ handleExportXls(fileName) {
+ if (!fileName || typeof fileName != 'string') {
+ fileName = '瀵煎嚭鏂囦欢'
+ }
+ let param = this.getQueryParams()
+ if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+ param['selections'] = this.selectedRowKeys.join(',')
+ }
+ param.pageSize = this.ipagination.pageSize
+ param.field = this.getQueryField()
+ param.parentId = this.queryParams.parentId
+ param.equipmentId = this.queryParams.equipmentId
+ param.startTime = this.queryParam.startTime
+ param.endTime = this.queryParam.endTime
+ console.log('瀵煎嚭鍙傛暟', param)
+ downFile(this.url.exportXlsUrl, param).then((data) => {
+ if (!data) {
+ this.$message.warning('鏂囦欢涓嬭浇澶辫触')
+ return
+ }
+ if (typeof window.navigator.msSaveBlob !== 'undefined') {
+ window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
+ } else {
+ let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
+ let link = document.createElement('a')
+ link.style.display = 'none'
+ link.href = url
+ link.setAttribute('download', fileName + '.xls')
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link) //涓嬭浇瀹屾垚绉婚櫎鍏冪礌
+ window.URL.revokeObjectURL(url) //閲婃斁鎺塨lob瀵硅薄
+ }
+ })
+ },
+ exportExcel() {
+ $('#DeviceList').table2excel({
+ exclude: '.noExl',
+ name: 'Excel Document Name',
+ filename: '鎵煩閰嶇疆',
+ exclude_img: true,
+ fileext: '.xls',
+ exclude_links: true,
+ exclude_inputs: true
+ })
+ },
+ //
+ // /**
+ // * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ // */
+ // handleWindowResize() {
+ // const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
+ // const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
+ // this.scrollY = boxHeight - tableHeadHeight - 50
+ // }
+ },
+ created() {
+ this.queryParam.typeTree = '1'
+ },
+ // mounted() {
+ // window.addEventListener('resize', this.handleWindowResize)
+ // this.handleWindowResize()
+ // },
+ // beforeDestroy() {
+ // window.removeEventListener('resize', this.handleWindowResize)
+ // }
}
</script>
-<style scoped>
+
+<style lang="less" scoped>
@import '~@assets/less/common.less';
- .equipMessage {
- width: 100%;
- height: 10%;
+ .device_list {
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
}
- .equipMessage table {
- width: 60%;
- height: 100%;
- line-height: 50%;
+ @media screen and (min-width: 1920px) {
+ .device_list {
+ height: 811px !important;
+ }
}
- .equipMessage table td {
- text-align: center;
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .device_list {
+ height: 811px !important;
+ }
}
- .equipMessage table td span {
- display: inline-block;
- width: 15px;
- height: 15px;
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .device_list {
+ height: 663px !important;
+ }
}
- .equipMessage table td .equipShutdown {
- background-color: #808080;
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .device_list {
+ height: 564px !important;
+ }
}
- .equipMessage table td .equipStandby {
- background-color: #ffbf37;
+ @media screen and (max-width: 1280px) {
+ .device_list {
+ height: 564px !important;
+ }
}
-
- .equipMessage table td .equipRun {
- background-color: #19FE01;
- }
-
- .equipMessage table td .equipAlarm {
- background-color: #FD0008;
- }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
index 5293259..548ef4d 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityList.vue
@@ -609,7 +609,7 @@
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(that.selectedRowKeys.length)
// that.$message.success(res.message);
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:res.message
});
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
index b721303..b13b57d 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
@@ -7,36 +7,53 @@
<a-col :span="12">
<a-form-item label="鏍囧噯鍔犲伐鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-search :readOnly="true" v-decorator="['duration', validatorRules.duration]"
- @search="deviceSearch" enter-button/>
+ @search="deviceSearch1" enter-button placeholder="璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿"/>
</a-form-item>
</a-col>
+ <a-col :span="12">
+ <a-form-item label="璁惧缁�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
+ @search="deviceSearch2" enter-button placeholder="璇烽�夋嫨璁惧"/>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="12">
<a-form-item label="闆朵欢鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ラ浂浠跺彿" v-decorator="['partsCode', validatorRules.partsCode]"></a-input>
+ <a-input :disabled="true" placeholder="璇疯緭鍏ラ浂浠跺彿"
+ v-decorator="['partsCode', validatorRules.partsCode]"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item label="绋嬪簭鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="true" placeholder="璇疯緭鍏ョ▼搴忓彿"
+ v-decorator="['sequenceNumber', validatorRules.sequenceNumber]"></a-input>
</a-form-item>
</a-col>
</a-row>
+ <!--<a-row :gutter="24">-->
+ <!--<a-col :span="12">-->
+ <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-input :disabled="true" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col :span="12">-->
+ <!--<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-input :disabled="true" placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-decorator="['equipmentName', validatorRules.equipmentName]"></a-input>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--</a-row>-->
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item label="绋嬪簭鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ョ▼搴忓彿" v-decorator="['sequenceNumber', validatorRules.sequenceNumber]"></a-input>
- </a-form-item>
- </a-col>
<a-col :span="12">
<a-form-item label="鎵规鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ユ壒娆″彿" v-decorator="['batchCode', validatorRules.batchCode]"></a-input>
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-decorator="['equipmentId', validatorRules.equipmentId]"></a-input>
+ <a-input :disabled="true" placeholder="璇疯緭鍏ユ壒娆″彿"
+ v-decorator="['batchCode', validatorRules.batchCode]"></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
- <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="true" placeholder="璇疯緭鍏ヨ澶囧悕绉�" v-decorator="['equipmentName', validatorRules.equipmentName]"></a-input>
+ <a-form-item label='鍔犲伐鏁伴噺' :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�"
+ v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
</a-form-item>
</a-col>
</a-row>
@@ -46,33 +63,32 @@
<j-date date-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏃ユ湡"
v-decorator="['efficientDate', validatorRules.efficientDate]"></j-date>
</a-form-item>
-
- </a-col>
- <a-col :span="12">
- <a-form-item label='鍔犲伐鏁伴噺' :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
- </a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
- <a-form-item label="澶囨敞" :labelCol="labelColLong1" :wrapperCol="wrapperColLong1">
- <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
- </a-form-item>
+ <a-form-item label="澶囨敞" :labelCol="labelColLong1" :wrapperCol="wrapperColLong1">
+ <a-textarea :maxLength="20" v-decorator="['remark', validatorRules.remark]"
+ placeholder="璇疯緭鍏ュ娉�"></a-textarea>
+ </a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
- <mdc-process-quantity-modal-list ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></mdc-process-quantity-modal-list>
+ <select-device-drawer ref="selectDeviceDrawer" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
+
+ <mdc-process-quantity-modal-list ref="deviceRepairListModel"
+ @sendSelectionRows="getDeviceRows"></mdc-process-quantity-modal-list>
</a-modal>
</template>
<script>
import moment from 'moment'
import pick from 'lodash.pick'
+ import SelectDeviceDrawer from '../../../../system/modules/SelectDeviceDrawer'
import mdcProcessQuantityModalList from './mdcProcessQuantityModalList'
- // import JDate from './JDate'
+
import {
getAction,
postAction,
@@ -84,19 +100,19 @@
export default {
name: 'mdcProcessQuantityModal',
- components: {mdcProcessQuantityModalList},
+ components: { SelectDeviceDrawer, mdcProcessQuantityModalList },
props: {},
data() {
return {
- mesag:21,
- readOnly:true,
+ mesag: 21,
+ readOnly: true,
title: '',
visible: false,
show: false,
model: {},
checked: false,
- startData:"",
- endData:"",
+ startData: '',
+ endData: '',
labelCol: {
xs: {
span: 24
@@ -148,21 +164,29 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- duration:{
- rules:[
- {required:true,message:'璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿'}
+ equipmentIds: {
+ rules: [
+ {
+ required: true,
+ message: '璇烽�夋嫨璁惧'
+ }
]
},
- efficientDate:{
- rules:[
- {required:true,message:'璇烽�夋嫨鏃ユ湡'}
+ duration: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿' }
]
},
- processQuantity:{
- rules:[
- {required:true,message:'璇烽�夋嫨鍔犲伐鏁伴噺'}
+ efficientDate: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏃ユ湡' }
]
},
+ processQuantity: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鍔犲伐鏁伴噺' }
+ ]
+ }
},
url: {
add: '/mdc/mdcProcessQuantity/add',
@@ -172,7 +196,7 @@
disableSubmit: true,
partCategoryCascade: [],
cascadeDefaultValue: [],
- standardId:""
+ standardId: ''
}
},
created() {
@@ -194,25 +218,31 @@
// // this.endData = dateStrings[1];
// // console.log(this.startData,this.endData);
// },
- onChangeEnd(dates, dateStrings){
- this.endTime = dateStrings[0];
+ onChangeEnd(dates, dateStrings) {
+ this.endTime = dateStrings[0]
},
getDeviceRows(val) {
- this.standardId = val[0].id
- this.form.setFieldsValue({
- equipmentId: val[0].equipmentId,
- equipmentName: val[0].equipmentName,
- duration: val[0].duration,
- partsCode: val[0].partsCode,
- batchCode: val[0].batchCode,
- sequenceNumber: val[0].sequenceNumber,
+ this.standardId = val[0].id
+ this.form.setFieldsValue({
+ equipmentId: val[0].equipmentId,
+ equipmentName: val[0].equipmentName,
+ duration: val[0].duration,
+ partsCode: val[0].partsCode,
+ batchCode: val[0].batchCode,
+ sequenceNumber: val[0].sequenceNumber
})
console.log(this.standardId)
},
- deviceSearch() {
+ deviceSearch1() {
this.$refs.deviceRepairListModel.openPage()
- this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
+ this.$refs.deviceRepairListModel.title = '閫夋嫨鏍囧噯鍔犲伐鏃堕棿'
this.$refs.deviceRepairListModel.disableSubmit = false
+ },
+ deviceSearch2() {
+ this.$refs.selectDeviceDrawer.visible = true
+ this.$refs.selectDeviceDrawer.selectedRowKeys = []
+ this.$refs.selectDeviceDrawer.selectedRows = []
+ this.$refs.selectDeviceDrawer.checkedKeys = this.form.getFieldValue('equipmentIds') ? this.form.getFieldValue('equipmentIds').split(',') : []
},
//绾ц仈妗唎nChange浜嬩欢
// onChange(value) {
@@ -244,7 +274,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'vacationType', 'notes',
+ this.form.setFieldsValue(pick(this.model, 'equipmentId', 'equipmentName', 'vacationDate', 'vacationType', 'notes'
))
})
},
@@ -277,37 +307,37 @@
// // this.endTime = ''
// that.confirmLoading = false
// }else{
- let obj
- if (!this.model.id) {
- formData.standardId = this.standardId
- obj = postAction(this.url.add, formData)
- } else {
- obj = requestPut(this.url.edit, formData, {
- id: this.model.id
- })
- }
- obj.then((res) => {
- if (res.success) {
- // that.$message.success("娣诲姞鎴愬姛")
- that.$notification.success({
- message:'娑堟伅',
- description:"娣诲姞鎴愬姛"
- });
- // that.$message.success(res.message)
- that.$emit('ok', res.result)
- } else {
- // that.$message.warning(res.message)
- that.$notification.warning({
- message:'娑堟伅',
- description:res.message
- });
- }
- }).finally(() => {
- that.confirmLoading = false
- that.close()
+ let obj
+ if (!this.model.id) {
+ formData.standardId = this.standardId
+ obj = postAction(this.url.add, formData)
+ } else {
+ obj = requestPut(this.url.edit, formData, {
+ id: this.model.id
+ })
+ }
+ obj.then((res) => {
+ if (res.success) {
+ // that.$message.success("娣诲姞鎴愬姛")
+ that.$notification.success({
+ message: '娑堟伅',
+ description: '娣诲姞鎴愬姛'
+ })
+ // that.$message.success(res.message)
+ that.$emit('ok', res.result)
+ } else {
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
})
}
- // }
+ }).finally(() => {
+ that.confirmLoading = false
+ that.close()
+ })
+ }
+ // }
// }
})
@@ -348,6 +378,17 @@
},
checkboxChange(e) {
this.checked = e.target.checked
+ },
+
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @param data 宸查�夋嫨鐨勮澶�
+ */
+ selectOK(data) {
+ console.log('data=', data)
+ this.form.setFieldsValue({
+ equipmentIds: data.join(',')
+ })
}
}
}
@@ -372,7 +413,8 @@
.ant-tabs-content .ant-form-item {
margin-bottom: 0px;
}
- /deep/ .ant-input-number{
- width: 100%!important;
+
+ /deep/ .ant-input-number {
+ width: 100% !important;
}
</style>
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
index 1b4fa7b..133e7cf 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModalList.vue
@@ -43,14 +43,14 @@
<!--</a-col>-->
<a-col :md="7" :sm="7">
- <a-form-item label="缁熶竴缂栫爜">
- <a-input placeholder="璇疯緭鍏ョ粺涓�缂栫爜妫�绱�" v-model="queryParam.equipmentId"></a-input>
+ <a-form-item label="闆朵欢鍙�">
+ <a-input placeholder="璇疯緭鍏ラ浂浠跺彿妫�绱�" v-model="queryParam.partsCode"></a-input>
</a-form-item>
</a-col>
<a-col :md="7" :sm="7">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヨ澶囧悕绉版绱�" v-model="queryParam.equipmentName"></a-input>
+ <a-form-item label="绋嬪簭鍙�">
+ <a-input placeholder="璇疯緭鍏ョ▼搴忓彿妫�绱�" v-model="queryParam.sequenceNumber"></a-input>
</a-form-item>
</a-col>
@@ -121,16 +121,7 @@
visible: false,
disableMixinCreated: true,
queryParam: {},
- columns: [{
- title: '缁熶竴缂栫爜',
- align: 'center',
- dataIndex: 'equipmentId',
- },
- {
- title: '璁惧鍚嶇О',
- align: 'center',
- dataIndex: 'equipmentName',
- },
+ columns: [
{
title: '闆朵欢鍙�',
align: 'center',
diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
index 9b0c3eb..5e50be4 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModelEdit.vue
@@ -45,17 +45,17 @@
<a-row :gutter="24">
<a-col :span="12">
- <a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-date date-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏃ユ湡"
- v-decorator="['efficientDate', validatorRules.efficientDate]"></j-date>
- </a-form-item>
-
- </a-col>
- <a-col :span="12">
<a-form-item label='鍔犲伐鏁伴噺' :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number :min="0" placeholder="璇疯緭鍏ュ姞宸ユ暟閲�" v-decorator="['processQuantity', validatorRules.processQuantity]"></a-input-number>
</a-form-item>
</a-col>
+
+ <a-col :span="12">
+ <a-form-item label="鏃ユ湡" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <j-date date-format="YYYY-MM-DD" placeholder="璇烽�夋嫨鏃ユ湡"
+ v-decorator="['efficientDate', validatorRules.efficientDate]"></j-date>
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
index e965db9..a3e423b 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationEdit.vue
@@ -3,20 +3,20 @@
:okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-row :gutter="24">
- <a-col :span="12">
- <a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"
- v-decorator="['equipmentId',validatorRules.equipmentId]"/>
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- v-decorator="['equipmentName',validatorRules.equipmentName]"/>
- </a-form-item>
- </a-col>
- </a-row>
+ <!--<a-row :gutter="24">-->
+ <!--<a-col :span="12">-->
+ <!--<a-form-item label="璁惧缂栧彿" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囩紪鍙�"-->
+ <!--v-decorator="['equipmentId',validatorRules.equipmentId]"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--<a-col :span="12">-->
+ <!--<a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+ <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"-->
+ <!--v-decorator="['equipmentName',validatorRules.equipmentName]"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--</a-row>-->
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="闆朵欢鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
index 55b62c7..fddb2e7 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationList.vue
@@ -5,13 +5,13 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24" style="width: 100%;">
<a-col :md="5" :sm="5">
- <a-form-item label="璁惧缂栧彿">
- <a-input placeholder="杈撳叆璁惧缂栧彿鏌ヨ" v-model="queryParams.equipmentId"></a-input>
+ <a-form-item label="闆朵欢鍙�">
+ <a-input placeholder="杈撳叆闆朵欢鍙锋煡璇�" v-model="queryParams.partsCode"></a-input>
</a-form-item>
</a-col>
<a-col :md="5" :sm="5" :xs="5">
- <a-form-item label="璁惧鍚嶇О">
- <a-input placeholder="杈撳叆璁惧鍚嶇О鏌ヨ" v-model="queryParams.equipmentName"></a-input>
+ <a-form-item label="绋嬪簭鍙�">
+ <a-input placeholder="杈撳叆绋嬪簭鍙锋煡璇�" v-model="queryParams.sequenceNumber"></a-input>
</a-form-item>
</a-col>
<a-col :md="2" :sm="2" :xs="2">
@@ -137,18 +137,6 @@
total: 0
},
columns: [
- {
- title: '璁惧缂栧彿',
- align: 'center',
- dataIndex: 'equipmentId',
- width:200
- },
- {
- title: '璁惧鍚嶇О',
- align: 'center',
- dataIndex: 'equipmentName',
- width:200
- },
{
title: '闆朵欢鍙�',
align: 'center',
diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
index 097c031..1c9ed22 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
@@ -3,14 +3,14 @@
:okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form :form="form">
- <a-row :gutter="24">
- <a-col :span="24">
- <a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
- @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
- </a-form-item>
- </a-col>
- </a-row>
+ <!--<a-row :gutter="24">-->
+ <!--<a-col :span="24">-->
+ <!--<a-form-item label="璁惧缁�" :labelCol="labelColLong" :wrapperCol="wrapperColLong">-->
+ <!--<a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"-->
+ <!--@search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>-->
+ <!--</a-form-item>-->
+ <!--</a-col>-->
+ <!--</a-row>-->
<a-row :gutter="24">
<a-col :span="12">
<a-form-item label="闆朵欢鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/system/modules/SelectDeviceDrawer.vue b/src/views/system/modules/SelectDeviceDrawer.vue
index 6015831..af9990b 100644
--- a/src/views/system/modules/SelectDeviceDrawer.vue
+++ b/src/views/system/modules/SelectDeviceDrawer.vue
@@ -90,6 +90,7 @@
data() {
return {
searchInput: '',
+ searchValue: '',
cardLoading: false,
loading: false,
treeDataSource: [],
--
Gitblit v1.9.3