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/mdcProcessQuantity/mdcProcessQuantityModal.vue | 216 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 129 insertions(+), 87 deletions(-)
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>
--
Gitblit v1.9.3