From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue | 153 +++++++++++++++++++++++++++++++-------------------
1 files changed, 95 insertions(+), 58 deletions(-)
diff --git a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
index 99b6c58..56a4156 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentScrapForm.vue
@@ -5,31 +5,61 @@
<!--涓昏〃鍖哄煙 -->
<!-- <a-tab-pane tab="璁惧鍙樺姩" :key="refKeys[0]" :forceRender="true" :class="'jeecg-tabs-top'" :animated="false">-->
<j-form-container :disabled="formDisabled">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-row>
- <a-col :xs="24" :sm="24">
- <a-form-model-item label="鍗曟嵁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num">
- <a-input v-model="model.num" placeholder="璇疯緭鍏ュ崟鎹彿"></a-input>
- </a-form-model-item>
- </a-col>
- <!-- <a-col :xs="24" :sm="12">-->
- <!-- <a-form-model-item label="瀹℃壒鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">-->
- <!-- <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="璇烽�夋嫨瀹℃壒鐘舵��" disabled/>-->
- <!-- </a-form-model-item>-->
- <!-- </a-col>-->
- <a-col :xs="24" :sm="12" v-show="false">
- <a-form-model-item label="鍙樺姩鏂瑰紡" show="false" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeMethod">
- <a-input v-model="model.changeMethod" placeholder="璇疯緭鍏ュ彉鍔ㄦ柟寮�" defaultValue="scrap"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :xs="24" :sm="24">
- <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
- <a-textarea v-model="model.remark" rows="4" placeholder="璇疯緭鍏ュ娉�" />
- </a-form-model-item>
- </a-col>
-
- </a-row>
- </a-form-model>
+ <!-- 涓昏〃鍗曞尯鍩� -->
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ slot="detail"
+ >
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item
+ label="鍗曟嵁鍙�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="num"
+ >
+ <a-input
+ v-model="model.num"
+ placeholder="灏嗙敱绯荤粺鑷姩鐢熸垚"
+ disabled
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col
+ :span="12"
+ :hidden=true
+ >
+ <a-form-model-item
+ label="鍙樺姩鏂瑰紡"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="changeMethod"
+ >
+ <a-input
+ v-model="model.changeMethod"
+ placeholder="璇疯緭鍏ュ彉鍔ㄦ柟寮�"
+ defaultValue="seal"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item
+ label="澶囨敞"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="remark"
+ >
+ <a-textarea
+ v-model="model.remark"
+ rows="4"
+ placeholder="璇疯緭鍏ュ娉�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-form-model>
</j-form-container>
<!-- </a-tab-pane>-->
@@ -199,7 +229,7 @@
align:'center',
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
key: 'equipmentNum',
type: JVXETypes.normal,
disabled: true,
@@ -395,6 +425,7 @@
url: {
add: '/eam/equipmentScrap/add',
edit: '/eam/equipmentScrap/edit',
+ getNum: '/eam/sysIdentity/getNumNew',
equipmentChange: {
list: '/eam/equipmentScrap/queryById'
},
@@ -491,6 +522,12 @@
if (this.model.id) {
let params = { equipmentChangeId: this.model.id }
this.requestSubTableData(this.url.equipmentScrapDetail.list, params, this.equipmentScrapDetailTable)
+ }else{
+ getAction(this.url.getNum, { type: 'EquipmentScrap', length: '4' }).then((res) => {
+ if (res.success) {
+ this.model.num = res.message
+ }
+ })
}
},
//鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
@@ -569,39 +606,39 @@
target.removeRows(rowId)
},
// 閲嶅啓add 鏂规硶 榛樿涓嶅鍔犱竴琛�
- add(num = 0, forceScrollToBottom = false) {
- if (num < 1) return
- // let timestamp = new Date().getTime()
- let rows = this.rows
- let row
- for (let i = 0; i < num; i++) {
- rows = this.push({}, false, rows)
- row = rows[rows.length - 1]
- }
- this.rows = rows
+ // add(num = 0, forceScrollToBottom = false) {
+ // if (num < 1) return
+ // // let timestamp = new Date().getTime()
+ // let rows = this.rows
+ // let row
+ // for (let i = 0; i < num; i++) {
+ // rows = this.push({}, false, rows)
+ // row = rows[rows.length - 1]
+ // }
+ // this.rows = rows
- this.$nextTick(() => {
- this.updateFormValues()
- })
- // 瑙﹀彂add浜嬩欢
- this.$emit('added', {
- row: (() => {
- let r = Object.assign({}, row)
- r.id = this.getCleanId(r.id)
- return r
- })(),
- target: this
- })
- // 璁剧疆婊氬姩鏉′綅缃�
- let tbody = this.getElement('tbody')
- let offsetHeight = tbody.offsetHeight
- let realScrollTop = tbody.scrollTop + offsetHeight
- if (forceScrollToBottom) {
- this.$nextTick(() => {
- this.resetScrollTop(this.$refs.scrollView.scrollHeight)
- })
- }
- }
+ // this.$nextTick(() => {
+ // this.updateFormValues()
+ // })
+ // // 瑙﹀彂add浜嬩欢
+ // this.$emit('added', {
+ // row: (() => {
+ // let r = Object.assign({}, row)
+ // r.id = this.getCleanId(r.id)
+ // return r
+ // })(),
+ // target: this
+ // })
+ // // 璁剧疆婊氬姩鏉′綅缃�
+ // let tbody = this.getElement('tbody')
+ // let offsetHeight = tbody.offsetHeight
+ // let realScrollTop = tbody.scrollTop + offsetHeight
+ // if (forceScrollToBottom) {
+ // this.$nextTick(() => {
+ // this.resetScrollTop(this.$refs.scrollView.scrollHeight)
+ // })
+ // }
+ // }
}
}
--
Gitblit v1.9.3