From 41d50b20c975faeaa9e5277bdcff13b5acecb575 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:57:37 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue | 166 +++++++++++++++++++++++++++++++------------------------
1 files changed, 93 insertions(+), 73 deletions(-)
diff --git a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
index 2fab0bc..26e2386 100644
--- a/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
+++ b/src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -7,7 +7,7 @@
<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/>
+ @search="deviceSearch" enter-button placeholder="璇烽�夋嫨璁惧"/>
</a-form-item>
</a-col>
</a-row>
@@ -15,27 +15,27 @@
<a-col :span="12">
<a-form-item label="鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨鏃堕棿"
- v-decorator="['torqueDate', validatorRules.torqueDate]"></j-date>
+ v-decorator="['torqueDate', validatorRules.torqueDate]"></j-date>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="鎵煩鍊�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number :min="0" :disabled="disableSubmit" placeholder="璇疯緭鍏ユ壄鐭╁��"
- v-decorator="['torqueValue', validatorRules.torqueValue]"/>
+ v-decorator="['torqueValue', validatorRules.torqueValue]"/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
- <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�" ></a-textarea>
- </a-form-item>
+ <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
+ <a-textarea :maxLength="20" v-decorator="['notes', validatorRules.notes]"
+ placeholder="璇疯緭鍏ュ娉�"></a-textarea>
+ </a-form-item>
</a-col>
</a-row>
</a-form>
</a-spin>
- <torqueconfiguration-modal-list ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></torqueconfiguration-modal-list>
-
+ <select-device-modal ref="selectDeviceModal" @selectFinished="selectOK" :title="'閫夋嫨璁惧'"/>
</a-modal>
</template>
@@ -52,22 +52,23 @@
import {
duplicateCheck
} from '@/api/api'
+ import SelectDeviceModal from '../../../../system/modules/SelectDeviceModal'
export default {
name: 'TorqueconfigurationModal',
- components: {TorqueconfigurationModalList},
+ components: { SelectDeviceModal },
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
@@ -103,30 +104,30 @@
confirmLoading: false,
form: this.$form.createForm(this),
validatorRules: {
- equipmentIds:{
- rules:[
+ equipmentIds: {
+ rules: [
{
- required:true,
- message: "璇烽�夋嫨璁惧"
- },
- ],
+ required: true,
+ message: '璇烽�夋嫨璁惧'
+ }
+ ]
},
- torqueDate:{
- rules:[
+ torqueDate: {
+ rules: [
{
- required:true,
- message: "璇烽�夋嫨鏃堕棿"
- },
- ],
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿'
+ }
+ ]
},
- torqueValue:{
- rules:[
+ torqueValue: {
+ rules: [
{
- required:true,
- message: "璇疯緭鍏ユ壄鐭╁��"
- },
- ],
- },
+ required: true,
+ message: '璇疯緭鍏ユ壄鐭╁��'
+ }
+ ]
+ }
},
url: {
@@ -158,21 +159,21 @@
// // 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) {
- var equipmentIds;
- for(var i = 0;i<val.length;i++){
+ var equipmentIds
+ for (var i = 0; i < val.length; i++) {
if (i == 0) {
- equipmentIds = val[i].equipmentId;
+ equipmentIds = val[i].equipmentId
} else {
- equipmentIds = equipmentIds + "," + val[i].equipmentId;
+ equipmentIds = equipmentIds + ',' + val[i].equipmentId
}
}
// console.log("========",equipmentIds);
this.form.setFieldsValue({
- equipmentIds: equipmentIds,
+ equipmentIds: equipmentIds
})
// this.form.setFieldsValue({
// equipmentId: val.equipmentId,
@@ -184,9 +185,10 @@
// })
},
deviceSearch() {
- this.$refs.deviceRepairListModel.openPage()
- this.$refs.deviceRepairListModel.title = '閫夋嫨璁惧'
- this.$refs.deviceRepairListModel.disableSubmit = false
+ this.$refs.selectDeviceModal.visible = true
+ this.$refs.selectDeviceModal.selectedRowKeys = []
+ this.$refs.selectDeviceModal.selectedRows = []
+ this.$refs.selectDeviceModal.checkedKeys = this.form.getFieldValue('equipmentIds') ? this.form.getFieldValue('equipmentIds').split(',') : []
},
//绾ц仈妗唎nChange浜嬩欢
// onChange(value) {
@@ -219,7 +221,7 @@
this.model = Object.assign({}, record)
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'equipmentIds', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime',
+ this.form.setFieldsValue(pick(this.model, 'equipmentIds', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime'
))
})
},
@@ -252,36 +254,36 @@
// // this.endTime = ''
// that.confirmLoading = false
// }else{
- let obj
- if (!this.model.id) {
- 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) {
+ 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()
+ })
+ }
+ // }
// }
})
@@ -322,7 +324,24 @@
},
checkboxChange(e) {
this.checked = e.target.checked
+ },
+
+ /**
+ * 閫夋嫨宸叉湁璁惧鍚庣偣鍑荤‘瀹氭椂瑙﹀彂
+ * @param data 宸查�夋嫨鐨勮澶�
+ */
+ selectOK(data) {
+ // let params = {}
+ // params.equipmentIdList = []
+ // for (var a = 0; a < data.length; a++) {
+ // params.equipmentIdList.push(data[a])
+ // }
+ console.log('data=', data)
+ this.form.setFieldsValue({
+ equipmentIds: data.join(',')
+ })
}
+
}
}
</script>
@@ -346,7 +365,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