From be0a6bf776b5ce3e388088e96295960eb7c0d406 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期日, 15 六月 2025 18:42:25 +0800
Subject: [PATCH] 调整
---
src/views/tms/requirement/ToolSharpeningList .vue | 11 ++---
src/views/tms/requirement/modules/ToolsSharpeningModal.vue | 81 ++++++++++++++++++++++++----------------
2 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/src/views/tms/requirement/ToolSharpeningList .vue b/src/views/tms/requirement/ToolSharpeningList .vue
index abaa2ab..ef06cd2 100644
--- a/src/views/tms/requirement/ToolSharpeningList .vue
+++ b/src/views/tms/requirement/ToolSharpeningList .vue
@@ -131,12 +131,11 @@
align:"center",
dataIndex: 'toolId'
},
- {
- title:'鍒�鍏峰悕绉�',
- align:"center",
- dataIndex: 'typeName'
- },
-
+ // {
+ // title:'鍒�鍏峰悕绉�',
+ // align:"center",
+ // dataIndex: 'typeName'
+ // },
{
title:'鍘傚',
align:"center",
diff --git a/src/views/tms/requirement/modules/ToolsSharpeningModal.vue b/src/views/tms/requirement/modules/ToolsSharpeningModal.vue
index d49bc28..2ed8659 100644
--- a/src/views/tms/requirement/modules/ToolsSharpeningModal.vue
+++ b/src/views/tms/requirement/modules/ToolsSharpeningModal.vue
@@ -122,12 +122,11 @@
</template>
<script>
-import { getAction, postAction, requestPut } from '@/api/manage'
+
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import ToolsModal from '@views/tms/requirement/modules/ToolsModal.vue'
-import pick from 'lodash.pick'
import DeviceListModel from '@views/mdc/base/modules/EquipmentList/DeviceListModal.vue'
-
+import { requestPut, postAction, httpAction } from '@/api/manage'
export default {
name: 'ToolsSharpeningModal',
mixins: [JVxeTableModelMixin],
@@ -167,8 +166,7 @@
lastSelectionData: null,
url: {
add: '/tms/toolSharpening/add',
- edit: '/tms/toolSharpening/edit',
- // queryDetailList: '/tms/toolSharpening/listToolSharpening'
+ edit: '/tms/toolSharpening/edit'
}
}
},
@@ -205,61 +203,78 @@
let that = this
that.visible = true
that.model = Object.assign({}, record)
- // this.$nextTick(() => {
- // this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
- // 'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue'))
- // })
},
- // edit(record) {
- // let that = this
- // that.visible = true
- // that.model = Object.assign({}, record)
- //
- // // 濡傛灉鏈� selectionRows 鏁版嵁锛屽垯閲嶆柊璧嬪��
- // if (this.lastSelectionData && this.lastSelectionData.length > 0) {
- // this.assignModelFromSelection(this.lastSelectionData[0])
- // console.log('this.model',this.assignModelFromSelection(this.lastSelectionData[0]))
- // }
- // },
+
close() {
this.$emit('close')
this.visible = false
-
},
handleOk() {
const that = this
- that.confirmLoading = true
-
- // 鉁� 瑙﹀彂琛ㄥ崟楠岃瘉
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
this.$refs.form.validate(valid => {
if (valid) {
let formData = Object.assign(this.model)
-
- let obj
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
if (!this.model.id) {
- obj = postAction(this.url.add, formData)
+ httpurl += this.url.add
+ method = 'post'
} else {
- obj = requestPut(this.url.edit, formData, { id: this.model.id })
+ httpurl += this.url.edit
+ method = 'put'
}
-
- obj.then((res) => {
+ httpAction(httpurl, this.model, method,formData).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.$emit('ok')
- that.close()
} else {
that.$message.warning(res.message)
}
}).finally(() => {
that.confirmLoading = false
+ that.close()
})
} else {
- that.$message.warning('璇峰～鍐欏繀濉瓧娈�')
- that.confirmLoading = false
return false
}
})
},
+ // handleOk() {
+ // const that = this
+ // that.confirmLoading = true
+ //
+ // // 鉁� 瑙﹀彂琛ㄥ崟楠岃瘉
+ // this.$refs.form.validate(valid => {
+ // if (valid) {
+ // let formData = Object.assign(this.model)
+ //
+ // 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(res.message)
+ // that.$emit('ok')
+ // that.close()
+ // } else {
+ // that.$message.warning(res.message)
+ // }
+ // }).finally(() => {
+ // that.confirmLoading = false
+ // })
+ // } else {
+ // that.$message.warning('璇峰～鍐欏繀濉瓧娈�')
+ // that.confirmLoading = false
+ // return false
+ // }
+ // })
+ // },
handleCancel() {
this.close()
--
Gitblit v1.9.3