From 1ec4da063b3195f4f46af969a9d170bda2df7c2a Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 23 八月 2023 17:36:08 +0800
Subject: [PATCH] 计量单位：重构， 备件相关功能页面调整
---
src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue | 35 -
src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue | 4
src/views/eam/UnitList.vue | 401 ++++++++++++++----------
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue | 28 -
src/views/spare/modules/sparePart/SparePart2List.vue | 6
src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue | 10
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue | 21
src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue | 18
src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue | 37 +-
src/views/spare/modules/sparePartReceive/SpareSelectList.vue | 16
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue | 8
src/views/eam/modules/unit/UnitForm.vue | 125 +++++++
src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue | 8
src/views/spare/modules/sparePart/SparePartModel.vue | 14
src/views/spare/modules/sparePartInventory/SparePart2List.vue | 12
src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue | 8
src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue | 36 +-
src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue | 8
src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue | 12
src/views/spare/modules/sparePartCancellingStocks/SpareSelectList.vue | 10
src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue | 12
src/views/eam/modules/unit/UnitModal.vue | 60 +++
src/views/spare/modules/sparePartScrap/SpareSelectList.vue | 16
src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue | 6
src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue | 8
src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue | 8
26 files changed, 576 insertions(+), 351 deletions(-)
diff --git a/src/views/eam/UnitList.vue b/src/views/eam/UnitList.vue
index 66f0a18..720f997 100644
--- a/src/views/eam/UnitList.vue
+++ b/src/views/eam/UnitList.vue
@@ -1,187 +1,258 @@
<template>
- <div>
- <a-card
- :bordered="true"
- style="height: 50%"
- >
- <a-row type="flex">
- <a-col><a-button
- type="primary"
- @click="handleAdd(da)"
- >鏂板缓</a-button></a-col>
- <a-col><a-button
- type="primary"
- @click="handleEdit(selectedRows)"
- >缂栬緫</a-button></a-col>
- <a-col><a-button
- type="primary"
- @click="batchDel(da)"
- >鍒犻櫎</a-button></a-col>
- <a-col style="left: 5%"><a-button type="primary">妯℃澘</a-button></a-col>
- <a-col style="left: 5%"><a-button type="primary">瀵煎叆</a-button></a-col>
- <a-col style="left: 5%"><a-button type="primary">瀵煎嚭</a-button></a-col>
- </a-row>
- </a-card>
- <a-row
- type="flex"
- :gutter="16"
- >
- <a-col
- :md="5"
- :sm="24"
+ <a-card :bordered="false" title='璁￠噺鍗曚綅'>
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
>
- 聽 聽 聽
- <MomUnitListLeft
- ref="MomUnitListLeft"
- class="MomUnitListLeft"
- @treeSelect="treeSelect"
- />
- 聽 聽
- </a-col>
- <a-col
- :md="24 - 5"
- :sm="24"
+ <a-row :gutter="24">
+
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鍗曚綅缂栫爜">
+ <j-input
+ placeholder="璇疯緭鍏ュ崟浣嶇紪鐮�"
+ v-model="queryParam.num"
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ <template>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鍗曚綅鍚嶇О">
+ <j-input
+ placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"
+ v-model="queryParam.name"
+ ></j-input>
+ </a-form-item>
+ </a-col>
+ </template>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button
+ @click="handleAdd"
+ type="primary"
+ icon="plus"
+ >鏂板</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>
+ <div
+ class="ant-alert ant-alert-info"
+ style="margin-bottom: 16px;"
>
- <MomUnitListRight
- ref="MomUnitListRight"
- class="MomUnitListRight"
- @searchkeys="selectedKeys"
- />
- </a-col>
- </a-row>
- <mom-unit-modal
+ <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected"
+ >娓呯┖</a>
+ </div>
+
+ <a-table
+ ref="table"
+ size="middle"
+ :scroll="{x:true}"
+ bordered
+ rowKey="id"
+ :columns="columns"
+ :dataSource="dataSource"
+ :pagination="ipagination"
+ :loading="loading"
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ class="j-table-force-nowrap"
+ @change="handleTableChange"
+ >
+
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a @click="handleEdit(record)">缂栬緫</a>
+
+ <a-divider type="vertical" />
+ <a-dropdown>
+ <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+ <a-menu slot="overlay">
+ <a-menu-item>
+ <a @click="handleDetail(record)">璇︽儏</a>
+ </a-menu-item>
+ <a-menu-item>
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
+ </span>
+
+ </a-table>
+ </div>
+
+ <unit-modal
ref="modalForm"
@ok="modalFormOk"
- ></mom-unit-modal>
- </div>
+ ></unit-modal>
+ </a-card>
</template>
<script>
-import MomUnitListLeft from './modules/unit/MomUnitListLeft'
-import MomUnitListRight from './modules/unit/MomUnitListRight'
-import MomUnitModal from './modules/unit/MomUnitModal'
+
+import '@assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { deleteAction } from '@/api/manage'
+import UnitModal from './modules/unit/UnitModal'
export default {
- name: 'MomUnitList',
- mixins: [JeecgListMixin],
- components: { MomUnitListLeft, MomUnitListRight, MomUnitModal },
+ name: 'EquipmentImportanceList',
+ mixins: [JeecgListMixin, mixinDevice],
+ components: {
+ UnitModal
+ },
data() {
return {
- description: '璁￠噺鍗曚綅椤甸潰',
- currentOrgCode: '',
- selectedRowKeys: [],
- selectedRows: [],
+ description: '璁￠噺鍗曚綅绠＄悊椤甸潰',
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: "center",
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1;
+ }
+ },
+ {
+ title: ' 璁￠噺鍗曚綅缂栫爜',
+ align: "center",
+ dataIndex: 'num'
+ },
+ {
+ title: '璁￠噺鍗曚綅鍚嶇О',
+ align: "center",
+ dataIndex: 'name'
+ },
+ {
+ title: '鍒涘缓浜�',
+ align: "center",
+ dataIndex: 'createBy'
+ },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: "center",
+ dataIndex: 'createTime'
+ },
+ {
+ title: '鏇存柊浜�',
+ align: "center",
+ dataIndex: 'updateBy'
+ },
+ {
+ title: '鏇存柊鏃ユ湡',
+ align: "center",
+ dataIndex: 'updateTime'
+ },
+ {
+ title: '澶囨敞',
+ align: "center",
+ dataIndex: 'remark'
+ },
+
+ {
+ title: '鎿嶄綔',
+ dataIndex: 'action',
+ align: "center",
+ fixed: "right",
+ width: 147,
+ scopedSlots: { customRender: 'action' }
+ }
+ ],
url: {
- list: '/base/getTree',
- deleteBatch: '/base/unit/deleteMomUnit',
+ list: "/base/unit/list",
+ delete: "/base/unit/delete",
+ deleteBatch: "/base/unit/deleteBatch",
+ exportXlsUrl: "/eam/equipmentImportance/exportXls",
+ importExcelUrl: "/eam/equipmentImportance/importExcel",
+
},
- da: [],
+ dictOptions: {},
+ superFieldList: [],
}
},
-
- methods: {
- //鏂板鏁版嵁锛堟柊寤烘寜閽Е鍙戯級
- handleAdd(da) {
- if (this.da.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�涓爲鑺傜偣锛�')
- return
- } else {
- this.$refs.modalForm.add(da, { cb: this.callback })
- }
- },
- //淇敼鏁版嵁锛堜慨鏀规寜閽Е鍙戯級
- handleEdit(selectedRows) {
- if (this.selectedRows.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉￠渶瑕佷慨鏀圭殑璁￠噺鍗曚綅锛�')
- return
- } else if (this.selectedRows.length > 1) {
- this.$message.warning('娉ㄦ剰锛氬彧鑳介�夋嫨涓�鏉¤閲忓崟浣嶈繘琛屼慨鏀癸紒')
- return
- } else {
- this.$refs.modalForm.edit(selectedRows, { cb: this.callback })
- }
- },
- //鎵归噺鍒犻櫎鍙充晶鏁版嵁锛堝垹闄ゆ寜閽Е鍙戯級
- batchDel(da) {
- if (!this.url.deleteBatch) {
- this.$message.error('璇疯缃畊rl.deleteBatch灞炴��!')
- return
- }
- if (this.selectedRowKeys.length <= 0) {
- this.$message.warning('璇烽�夋嫨涓�鏉¤褰曪紒')
- 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.$message.success(res.message)
- } else {
- that.$message.warning(res.message)
- }
- })
- .finally(() => {
- that.loading = false
- //閲嶆柊璁＄畻鍒嗛〉闂
- that.reCalculatePage(that.selectedRowKeys.length)
- that.onClearSelected()
- that.$refs.MomUnitListRight.loadData({ id: da.id })
- that.loadTree()
- })
- },
- })
- }
- },
- //閲嶆柊璁＄畻鍒嗛〉
- reCalculatePage(count) {
- //鎬绘暟閲�-count
- let total = this.ipagination.total - count
- //鑾峰彇鍒犻櫎鍚庣殑鍒嗛〉鏁�
- let currentIndex = Math.ceil(total / this.ipagination.pageSize)
- //鍒犻櫎鍚庣殑鍒嗛〉鏁�<鎵�鍦ㄥ綋鍓嶉〉
- if (currentIndex < this.ipagination.current) {
- this.ipagination.current = currentIndex
- }
- console.log('currentIndex', currentIndex)
- },
- //娓呴櫎鍙充晶閫変腑椤�
- onClearSelected() {
- this.selectedRowKeys = []
- this.selectedRows = []
- },
- //宸﹀彸鑱斿姩锛坉a涓哄乏渚ч�変腑鏍戠殑鏁版嵁锛屽瓙鎺т欢涓繑鍥烇級
- treeSelect(da) {
- let id = da.id
- this.da = da
- this.onClearSelected()
- this.$refs.MomUnitListRight.loadData({ unitCategoryId: id })
- },
- //鍙充晶鍒楄〃閫変腑浜嬩欢
- selectedKeys(selectedRowKeys, selectedRows) {
- this.selectedRowKeys = selectedRowKeys
- this.selectedRows = selectedRows
- },
- //鍔犺浇宸︿晶鏍�
- loadTree() {
- this.$refs.MomUnitListLeft.queryTreeData()
- },
- //鏂板缂栬緫淇濆瓨鍚庡洖璋冨嚱鏁板洖鏄鹃〉闈㈡暟鎹�
- callback(id) {
- this.$refs.MomUnitListRight.loadData({ id: id })
- this.$refs.MomUnitListRight.getList()
+ created() {
+ // this.getSuperFieldList();
+ },
+ computed: {
+ importExcelUrl: function () {
+ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
},
},
+ methods: {
+ // initDictConfig() {
+ // },
+ // getSuperFieldList() {
+ // let fieldList = [];
+ // fieldList.push({ type: 'string', value: 'num', text: '閲嶈搴︾紪鐮�', dictCode: '' })
+ // fieldList.push({ type: 'string', value: 'name', text: '閲嶈搴﹀悕绉�', dictCode: '' })
+ // fieldList.push({ type: 'string', value: 'remark', text: '澶囨敞', dictCode: '' })
+ // fieldList.push({ type: 'string', value: 'createBy', text: '鍒涘缓浜�', dictCode: '' })
+ // fieldList.push({ type: 'datetime', value: 'createTime', text: '鍒涘缓鏃ユ湡' })
+ // fieldList.push({ type: 'string', value: 'updateBy', text: '鏇存柊浜�', dictCode: '' })
+ // fieldList.push({ type: 'datetime', value: 'updateTime', text: '鏇存柊鏃ユ湡' })
+ // this.superFieldList = fieldList
+ // }
+ }
}
</script>
<style scoped>
diff --git a/src/views/eam/modules/unit/UnitForm.vue b/src/views/eam/modules/unit/UnitForm.vue
new file mode 100644
index 0000000..1014e19
--- /dev/null
+++ b/src/views/eam/modules/unit/UnitForm.vue
@@ -0,0 +1,125 @@
+<template>
+ <a-spin :spinning='confirmLoading'>
+ <j-form-container :disabled='formDisabled'>
+ <a-form-model ref='form' :model='model' :rules='validatorRules' slot='detail'>
+ <a-row :span='24'>
+ <a-col :span='12'>
+ <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 :span='12'>
+ <a-form-model-item label='鍗曚綅鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='name'>
+ <a-input v-model='model.name' placeholder='璇疯緭鍏ュ崟浣嶅悕绉�'></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :span='24'>
+ <a-col :span='12'>
+ <a-form-model-item label='澶囨敞' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='remark'>
+ <a-textarea v-model='model.remark' placeholder='璇疯緭鍏ュ娉�'></a-textarea>
+ </a-form-model-item>
+ </a-col>
+
+ </a-row>
+
+
+ </a-form-model>
+ </j-form-container>
+ </a-spin>
+</template>
+
+<script>
+
+import { httpAction, getAction } from '@api/manage'
+import { validateDuplicateValue } from '@/utils/util'
+
+export default {
+ name: 'UnitForm',
+ components: {},
+ props: {
+ //琛ㄥ崟绂佺敤
+ disabled: {
+ type: Boolean,
+ default: false,
+ required: false
+ }
+ },
+ data() {
+ return {
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 8 },
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 },
+ },
+ confirmLoading: false,
+ validatorRules: {
+ num: [
+ { required: true, message: '璇疯緭鍏ュ崟浣嶇紪鐮�!' },
+ { validator: (rule, value, callback) => validateDuplicateValue('mom_base_unit', 'num', value, this.model.id, callback) }
+ ],
+ name: [
+ { required: true, message: '璇疯緭鍏ュ崟浣嶅悕绉�!' },
+ { validator: (rule, value, callback) => validateDuplicateValue('mom_base_unit', 'name', value, this.model.id, callback) }
+ ]
+ },
+ url: {
+ add: '/base/unit/add',
+ edit: '/base/unit/edit',
+ queryById: '/base/unit/queryById'
+ }
+ }
+ },
+ computed: {
+ formDisabled() {
+ return this.disabled
+ }
+ },
+ created() {
+ //澶囦唤model鍘熷鍊�
+ this.modelDefault = JSON.parse(JSON.stringify(this.model))
+ },
+ methods: {
+ add() {
+ this.edit(this.modelDefault)
+ },
+ edit(record) {
+ this.model = Object.assign({}, record)
+ this.visible = true
+ },
+ submitForm() {
+ const that = this
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
+ if (!this.model.id) {
+ httpurl += this.url.add
+ method = 'post'
+ } else {
+ httpurl += this.url.edit
+ method = 'put'
+ }
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message)
+ that.$emit('ok')
+ } else {
+ that.$message.warning(res.message)
+ }
+ }).finally(() => {
+ that.confirmLoading = false
+ })
+ }
+
+ })
+ }
+ }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/eam/modules/unit/UnitModal.vue b/src/views/eam/modules/unit/UnitModal.vue
new file mode 100644
index 0000000..4b3746d
--- /dev/null
+++ b/src/views/eam/modules/unit/UnitModal.vue
@@ -0,0 +1,60 @@
+<template>
+ <j-modal
+ :title="title"
+ :width="width"
+ :visible="visible"
+ switchFullscreen
+ @ok="handleOk"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+ @cancel="handleCancel"
+ cancelText="鍏抽棴">
+ <unit-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></unit-form>
+ </j-modal>
+</template>
+
+<script>
+
+ import UnitForm from './UnitForm'
+ export default {
+ name: 'UnitModal',
+ components: {
+ UnitForm
+ },
+ data () {
+ return {
+ title:'',
+ width:800,
+ visible: false,
+ disableSubmit: false
+ }
+ },
+ methods: {
+ add () {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.add();
+ })
+ },
+ edit (record) {
+ this.visible=true
+ this.$nextTick(()=>{
+ this.$refs.realForm.edit(record);
+ })
+ },
+ close () {
+ this.$emit('close');
+ this.visible = false;
+ },
+ handleOk () {
+ this.$refs.realForm.submitForm();
+ },
+ submitCallback(){
+ this.$emit('ok');
+ this.visible = false;
+ },
+ handleCancel () {
+ this.close()
+ }
+ }
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/spare/modules/sparePart/SparePart2List.vue b/src/views/spare/modules/sparePart/SparePart2List.vue
index 87f593a..9fd59c3 100644
--- a/src/views/spare/modules/sparePart/SparePart2List.vue
+++ b/src/views/spare/modules/sparePart/SparePart2List.vue
@@ -238,15 +238,15 @@
dataIndex: 'constructorId_dictText',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitId_dictText',
},
- {
+ /* {
title: '杈呭崟浣�',
align: "center",
dataIndex: 'auxiliaryUnitId_dictText',
- },
+ }, */
// {
// title: '涓绘暟閲�',
// align: "center",
diff --git a/src/views/spare/modules/sparePart/SparePartModel.vue b/src/views/spare/modules/sparePart/SparePartModel.vue
index abbc377..50ce2b1 100644
--- a/src/views/spare/modules/sparePart/SparePartModel.vue
+++ b/src/views/spare/modules/sparePart/SparePartModel.vue
@@ -89,12 +89,12 @@
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
- label="涓诲崟浣�"
+ label="鍗曚綅"
>
<j-dict-select-tag
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨涓诲崟浣�'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨鍗曚綅'"
:triggerChange="true"
dictCode="mom_base_unit,name,id,status!='0' and del_flag!='1'"
v-decorator="['mainUnitId', validatorRules.mainUnitId]"
@@ -104,7 +104,7 @@
</a-col>
</a-row>
<a-row style="width: 100%">
- <a-col :span="24 / 2">
+<!-- <a-col :span="24 / 2">
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -119,7 +119,7 @@
@change="(e)=>handle3Change(e)"
/>
</a-form-item>
- </a-col>
+ </a-col>-->
<a-col :span="24 / 2 ">
<a-form-item
:labelCol="labelCol"
@@ -134,8 +134,8 @@
</a-form-item>
</a-col>
</a-row>
- <a-row style="width: 100%">
- <!-- hidden -->
+<!-- <a-row style="width: 100%">
+ <!– hidden –>
<a-col :span="24 / 2 ">
<a-form-item
:labelCol="labelCol"
@@ -149,7 +149,7 @@
/>
</a-form-item>
</a-col>
- </a-row>
+ </a-row>-->
<a-row style="width: 100%">
<a-col :span="24 / 2">
<a-form-item
diff --git a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue
index 2ba7108..ff12c3a 100644
--- a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue
+++ b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksDetailList.vue
@@ -140,22 +140,22 @@
dataIndex: 'supplierName'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
- },
+ }, */
{
title: '鍑哄簱鏁伴噺',
align: 'center',
dataIndex: 'outboundMainQuantity'
},
{
- title: '閫�搴撲富鏁伴噺',
+ title: '閫�搴撴暟閲�',
align: 'center',
dataIndex: 'mainQuantity'
},
diff --git a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
index d9abc99..c75fab6 100644
--- a/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
+++ b/src/views/spare/modules/sparePartCancellingStocks/SparePartCancellingStocksModal.vue
@@ -246,7 +246,7 @@
dataIndex: 'warehouseLocationNum'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
@@ -255,11 +255,11 @@
align: 'center',
dataIndex: 'outboundMainQuantity'
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
- },
+ }, */
{
title: '閫�搴撴暟閲�',
align: 'center',
@@ -342,9 +342,9 @@
model: data[i].model,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitName,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
- auxiliaryUnitName: data[i].auxiliaryUnitName,
- conversionRatio: data[i].conversionRatio,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId,
+ auxiliaryUnitName: data[i].auxiliaryUnitName, */
+ /* conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
supplierId: data[i].supplierId,
diff --git a/src/views/spare/modules/sparePartCancellingStocks/SpareSelectList.vue b/src/views/spare/modules/sparePartCancellingStocks/SpareSelectList.vue
index 4e74a47..9852a21 100644
--- a/src/views/spare/modules/sparePartCancellingStocks/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartCancellingStocks/SpareSelectList.vue
@@ -153,12 +153,12 @@
align: 'center',
dataIndex: 'warehouseLocationNum'
},*/
- {
+ /* {
title: '璁＄畻姣斾緥',
align: "center",
dataIndex: 'conversionRatio',
- },
+ }, */
{
title: '渚涘簲鍟�',
align: "center",
@@ -175,15 +175,15 @@
dataIndex: 'mainUnitName'
},
{
- title: '鍑哄簱涓绘暟閲�',
+ title: '鍑哄簱鏁伴噺',
align: 'center',
dataIndex: 'outboundMainQuantity'
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
- },
+ }, */
/* {
title: '搴撳瓨杈呮暟閲�',
align: 'center',
diff --git a/src/views/spare/modules/sparePartInventory/SparePart2List.vue b/src/views/spare/modules/sparePartInventory/SparePart2List.vue
index 82a7f72..3475333 100644
--- a/src/views/spare/modules/sparePartInventory/SparePart2List.vue
+++ b/src/views/spare/modules/sparePartInventory/SparePart2List.vue
@@ -178,25 +178,25 @@
dataIndex: 'constructorId_dictText',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitId_dictText',
},
- {
+ /* {
title: '杈呭崟浣�',
align: "center",
dataIndex: 'auxiliaryUnitId_dictText',
- },
+ }, */
{
- title: '鎬讳富鏁伴噺',
+ title: '鎬绘暟閲�',
align: "center",
dataIndex: 'totalMainQuantity',
},
- {
+ /* {
title: '鎬昏緟鏁伴噺',
align: "center",
dataIndex: 'totalAuxiliaryQuantity',
- },
+ }, */
{
title: '鏈夋晥鏈�',
align: "center",
diff --git a/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue b/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
index cfbf9a5..9bbf539 100644
--- a/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
+++ b/src/views/spare/modules/sparePartInventory/SparePartInventoryList.vue
@@ -55,16 +55,16 @@
dataIndex: 'batchNum',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitName',
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: "center",
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: "center",
dataIndex: 'auxiliaryUnitName',
@@ -73,7 +73,7 @@
title: '杈呮暟閲�',
align: "center",
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
title: '浠撳簱',
align: "center",
diff --git a/src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue b/src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue
index 4012f8c..3782b78 100644
--- a/src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue
+++ b/src/views/spare/modules/sparePartOutbound/JSelectSparePartInventoryModal.vue
@@ -153,17 +153,17 @@
dataIndex: 'manufactureDate'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
{
- title: '搴撳瓨涓绘暟閲�',
+ title: '搴撳瓨鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity'
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
@@ -172,7 +172,7 @@
title: '搴撳瓨杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity'
- },
+ }, */
],
selectedRowKeys: [],
oldSelectRows: [],
diff --git a/src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue b/src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue
index 65f212b..8248db4 100644
--- a/src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue
+++ b/src/views/spare/modules/sparePartOutbound/SparePartOutboundDetail.vue
@@ -148,12 +148,12 @@
dataIndex: 'supplierName',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitName',
},
{
- title: '鍑哄簱涓绘暟閲�',
+ title: '鍑哄簱鏁伴噺',
align: "center",
dataIndex: 'outboundMainQuantity',
},
diff --git a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
index 16740e3..65cdd60 100644
--- a/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
+++ b/src/views/spare/modules/sparePartOutbound/SparePartOutboundModal.vue
@@ -39,21 +39,6 @@
tree-default-expand-all
v-decorator="['departId', validatorRules.departId]"
/>
-<!-- <a-select
- :placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :disabled="disableSubmit"
- :options="this.departs"
- style="width: 100%"
- v-decorator="['departId', validatorRules.departId]"
- />-->
-<!-- <j-dict-select-tag
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
- :triggerChange="true"
- dictCode="sys_depart,depart_name,id,del_flag!='1'"
- v-decorator="['departId', validatorRules.departId]"
- />-->
</a-form-item>
</a-col>
</a-row>
@@ -244,16 +229,16 @@
dataIndex: 'warehouseLocationNum'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
@@ -262,9 +247,9 @@
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity'
- },
+ }, */
{
- title: '鍑哄簱涓绘暟閲�',
+ title: '鍑哄簱鏁伴噺',
align: 'center',
dataIndex: 'outboundMainQuantity',
scopedSlots: { customRender: 'outboundMainQuantity' }
@@ -351,10 +336,10 @@
mainQuantity: data[i].mainQuantity,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitName,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
- auxiliaryUnitName: data[i].auxiliaryUnitName,
- conversionRatio: data[i].conversionRatio,
+ /* auxiliaryQuantity: data[i].auxiliaryQuantity, */
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId,
+ auxiliaryUnitName: data[i].auxiliaryUnitName, */
+ /* conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
supplierId: data[i].supplierId,
@@ -482,7 +467,7 @@
if (target) {
if (column.dataIndex == 'outboundMainQuantity') {
target[column.dataIndex] = value;
- target["outboundAuxiliaryQuantity"] = value * target.conversionRatio
+ /* target["outboundAuxiliaryQuantity"] = value * target.conversionRatio */
}
//鏄剧ず甯﹁繃鏉ョ殑鏁版嵁
that.dataSource = temp;
diff --git a/src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue b/src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue
index c892000..eeea2cc 100644
--- a/src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue
+++ b/src/views/spare/modules/sparePartPurchaseStorage/JSelectSparePartModal.vue
@@ -128,15 +128,15 @@
dataIndex: 'constructorId_dictText'
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitId_dictText'
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitId_dictText'
- },
+ }, */
],
selectedRowKeys: [],
oldSelectRows: [],
diff --git a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue
index 63688e3..962a5d6 100644
--- a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue
+++ b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageDetail.vue
@@ -148,16 +148,16 @@
dataIndex: 'supplierName',
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: "center",
dataIndex: 'mainUnitName',
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: "center",
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: "center",
dataIndex: 'auxiliaryUnitName',
@@ -166,7 +166,7 @@
title: '杈呮暟閲�',
align: "center",
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
title: '搴撳尯',
align: "center",
diff --git a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
index f85039d..930239a 100644
--- a/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
+++ b/src/views/spare/modules/sparePartPurchaseStorage/SparePartPurchaseStorageModal.vue
@@ -31,14 +31,7 @@
:labelCol='labelCol'
:wrapperCol='wrapperCol'
>
-<!-- <j-dict-select-tag
- allow-clear
- :disabled='disableSubmit'
- :placeholder="disableSubmit?'':'璇烽�夋嫨閲囪喘閮ㄩ棬'"
- :triggerChange='true'
- dictCode="sys_depart,depart_name,id,del_flag!='1'"
- v-decorator="['departId', validatorRules.departId]"
- />-->
+
<a-tree-select
style="width: 100%"
:dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
@@ -47,13 +40,6 @@
tree-default-expand-all
v-decorator="['departId', validatorRules.departId]"
/>
-<!-- <a-select
- :placeholder="'璇烽�夋嫨閲囪喘閮ㄩ棬'"
- :options="this.departs"
- style="width: 100%"
- :disabled="disableSubmit"
- v-decorator="['departId', validatorRules.departId]"
- />-->
</a-form-item>
</a-col>
</a-row>
@@ -291,17 +277,17 @@
scopedSlots: { customRender: 'manufactureDate' }
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitName'
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
scopedSlots: { customRender: 'mainQuantity' }
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitName'
@@ -310,7 +296,7 @@
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity'
- },
+ }, */
{
title: '鎿嶄綔',
align: 'center',
@@ -387,9 +373,9 @@
model: data[i].model,
mainUnitId: data[i].mainUnitId,
mainUnitName: data[i].mainUnitId_dictText,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId,
auxiliaryUnitName: data[i].auxiliaryUnitId_dictText,
- conversionRatio: data[i].conversionRatio,
+ conversionRatio: data[i].conversionRatio, */
constructorId: data[i].constructorId,
constructorName: data[i].constructorId_dictText,
suppliers: this.suppliers,
diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
index e7b36de..b8a48a0 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveDeatilList.vue
@@ -169,18 +169,18 @@
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitIdName',
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitIdName',
@@ -191,7 +191,7 @@
align: 'center',
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
title: '棰嗙敤鏁伴噺',
align: 'center',
diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
index 9184f06..f64c147 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
@@ -190,7 +190,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
align:'center',
@@ -199,7 +199,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
align:'center',
@@ -207,7 +207,7 @@
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
type: JVXETypes.normal,
@@ -224,16 +224,16 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
key: 'mainQuantity',
type: JVXETypes.normal,
align:'center',
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+/* formatter({ cellValue, row, column }) {
if (cellValue != null) {
let conversionRatio = row.conversionRatio
@@ -243,7 +243,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -261,7 +261,7 @@
]
},
- {
+ /* {
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
align:'center',
@@ -269,17 +269,17 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0
- },
+ }, */
{
- title: '棰嗙敤涓绘暟閲�',
+ title: '棰嗙敤鏁伴噺',
key: 'receiveMainQuantity',
align:'center',
type: JVXETypes.inputNumber,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+/* formatter({ cellValue, row, column }) {
if (cellValue != null) {
let conversionRatio = row.conversionRatio
console.log(conversionRatio)
@@ -289,7 +289,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -308,7 +308,7 @@
}
]
},
- {
+ /* {
title: '棰嗙敤杈呮暟閲�',
align:'center',
key: 'receiveMainQuantity',
@@ -316,7 +316,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
@@ -423,18 +423,18 @@
model: data[i].model,
specification: data[i].specification,
mainUnitId: data[i].mainUnitId,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId, */
mainUnitIdName: data[i].mainUnitId_dictText,
- auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
+ /* auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
mainQuantity: data[i].mainQuantity,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
+ /* auxiliaryQuantity: data[i].auxiliaryQuantity, */
manufactureDate: data[i].manufactureDate,
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
batchNum: data[i].batchNum,
ReceiveReason: data[i].ReceiveReason,
validityPeriod:data[i].validityPeriod,
- conversionRatio:data[i].conversionRatio
+ /* conversionRatio:data[i].conversionRatio */
}
}
addRows.push(sparesReceiveDetail)
diff --git a/src/views/spare/modules/sparePartReceive/SpareSelectList.vue b/src/views/spare/modules/sparePartReceive/SpareSelectList.vue
index 20f8999..8724e64 100644
--- a/src/views/spare/modules/sparePartReceive/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartReceive/SpareSelectList.vue
@@ -123,36 +123,36 @@
width: 150,
},
- { title: '涓诲崟浣�',
+ { title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitId_dictText',
width: 150,
},
- { title: '杈呭崟浣�',
+ /* { title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitId_dictText',
width: 150
- },
- { title: '涓绘暟閲�',
+ }, */
+ { title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
width: 150
},
- { title: '杈呮暟閲�',
+ /* { title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
width: 150
- },
- {
+ }, */
+ /* {
title: '鎹㈢畻姣斾緥',
align: 'center',
dataIndex: 'conversionRatio',
width: 150
- }
+ } */
],
selectedRowKeys: [],
oldSelectRows: [],
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
index c97e5cf..5b81724 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapDetailList.vue
@@ -179,44 +179,44 @@
ellipsis: true
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitIdName',
},
{
- title: '搴撳瓨涓绘暟閲�',
+ title: '搴撳瓨鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitIdName',
ellipsis: true
- },
- {
+ }, */
+ /* {
title: '搴撳瓨杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
- },
+ }, */
{
- title: '鎶ュ簾涓绘暟閲�',
+ title: '鎶ュ簾鏁伴噺',
align: 'center',
dataIndex: 'scrapMainQuantity',
},
- {
+ /* {
title: '鎶ュ簾杈呮暟閲�',
align: 'center',
dataIndex: 'scrapAuxiliaryQuantity',
- },
+ }, */
{
title: '鎶ュ簾鍘熷洜',
align: 'center',
diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index f422f8c..f101143 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -70,7 +70,6 @@
:columns='sparesScrapDetailTable.columns'
:dataSource='sparesScrapDetailTable.dataSource'
:maxHeight='300'
- @valueChange="changeAuxiliaryQuantity"
:disabled='formDisabled'
:rowNumber='true'
:rowSelection='true'
@@ -236,7 +235,7 @@
]
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
width: '200px',
@@ -245,7 +244,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
align:'center',
@@ -253,7 +252,7 @@
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
type: JVXETypes.normal,
@@ -270,9 +269,9 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
key: 'mainQuantity',
align:'center',
type: JVXETypes.normal,
@@ -281,7 +280,7 @@
defaultValue: ''
},
- {
+ /* {
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
type: JVXETypes.normal,
@@ -289,7 +288,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
title: '澶囦欢id',
key: 'sparePartId',
@@ -309,14 +308,14 @@
defaultValue: ''
},
{
- title: '鎶ュ簾涓绘暟閲�',
+ title: '鎶ュ簾鏁伴噺',
key: 'scrapMainQuantity',
align:'center',
type: JVXETypes.inputNumber,
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- formatter({ cellValue, row, column }) {
+ /* formatter({ cellValue, row, column }) {
if (cellValue != null) {
let conversionRatio = row.conversionRatio
console.log(conversionRatio)
@@ -326,7 +325,7 @@
}
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -345,7 +344,7 @@
}
]
},
- {
+ /* {
title: '鎶ュ簾杈呮暟閲�',
align:'center',
key: 'scrapAuxiliaryQuantity',
@@ -353,7 +352,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
title: '搴撳尯',
align:'center',
@@ -474,13 +473,13 @@
model: data[i].model,
specification: data[i].specification,
mainUnitId: data[i].mainUnitId,
- auxiliaryUnitId: data[i].auxiliaryUnitId,
+ /* auxiliaryUnitId: data[i].auxiliaryUnitId, */
mainUnitIdName: data[i].mainUnitId_dictText,
- auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
+ /* auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
mainQuantity: data[i].mainQuantity,
- auxiliaryQuantity: data[i].auxiliaryQuantity,
+ /* auxiliaryQuantity: data[i].auxiliaryQuantity, */
scrapMainQuantity: data[i].scrapMainQuantity,
- scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity,
+ /* scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity, */
manufactureDate: data[i].manufactureDate,
constructorId: data[i].constructorId,
constructorName: data[i].constructorName,
@@ -553,13 +552,13 @@
this.$emit('close')
this.$refs.form.clearValidate()
},
- changeAuxiliaryQuantity(target){
+/* changeAuxiliaryQuantity(target){
console.log(target.columnIndex)
let num=target.columnIndex
if (target.columnIndex ===num){
target.row.scrapAuxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.scrapMainQuantity)
}
- }
+ } */
}
}
</script>
diff --git a/src/views/spare/modules/sparePartScrap/SpareSelectList.vue b/src/views/spare/modules/sparePartScrap/SpareSelectList.vue
index 4e79c7a..6c1776c 100644
--- a/src/views/spare/modules/sparePartScrap/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartScrap/SpareSelectList.vue
@@ -131,35 +131,35 @@
width: 150,
},
- { title: '涓诲崟浣�',
+ { title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitId_dictText',
width: 150,
},
- { title: '杈呭崟浣�',
+ /* { title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitId_dictText',
width: 150
- },
- { title: '搴撳瓨涓绘暟閲�',
+ }, */
+ { title: '搴撳瓨鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
width: 150
},
- { title: '搴撳瓨杈呮暟閲�',
+ /* { title: '搴撳瓨杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
width: 150
- },
- {
+ }, */
+ /* {
title: '鎹㈢畻姣斾緥',
align: 'center',
dataIndex: 'conversionRatio'
- }
+ } */
],
selectedRowKeys: [],
oldSelectRows: [],
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue
index 9cb742d..7d10f26 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementDetailList.vue
@@ -167,29 +167,29 @@
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
align: 'center',
dataIndex: 'mainUnitIdName',
},
{
- title: '涓绘暟閲�',
+ title: '鏁伴噺',
align: 'center',
dataIndex: 'mainQuantity',
},
- {
+ /* {
title: '杈呮暟閲�',
align: 'center',
dataIndex: 'auxiliaryQuantity',
- },
- {
+ }, */
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitIdName',
- },
+ }, */
{
title: '闇�姹傛棩鏈�',
align: 'center',
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
index 1cf9ac2..29ded9d 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SparePartScrapRequirementForm.vue
@@ -59,7 +59,6 @@
:dataSource='sparesScrapRequirementDetailTable.dataSource'
:maxHeight='300'
:disabled='formDisabled'
- @valueChange="changeAuxiliaryQuantity"
:alwaysEdit='true'
:rowNumber='true'
:bordered='bordered'
@@ -182,7 +181,7 @@
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitIdName',
type: JVXETypes.normal,
align:'center',
@@ -191,7 +190,7 @@
defaultValue: ''
},
{
- title: '涓诲崟浣�',
+ title: '鍗曚綅',
key: 'mainUnitId',
type: JVXETypes.hidden,
align:'center',
@@ -199,7 +198,7 @@
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
},
- {
+ /* {
title: '杈呭崟浣�',
key: 'auxiliaryUnitIdName',
align:'center',
@@ -216,7 +215,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: ''
- },
+ }, */
{
title: '涓绘暟閲�',
key: 'mainQuantity',
@@ -225,7 +224,7 @@
width: '200px',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0,
- Function({cellValue, row, column}){
+/* Function({cellValue, row, column}){
console.log(cellValue)
console.log(row)
console.log(column)
@@ -237,7 +236,7 @@
}
console.log(cellValue)
return cellValue
- },
+ }, */
validateRules: [
{
required: true,
@@ -255,7 +254,7 @@
]
},
- {
+ /* {
title: '杈呮暟閲�',
key: 'auxiliaryQuantity',
type: JVXETypes.normal,
@@ -263,7 +262,7 @@
align:'center',
placeholder: '璇疯緭鍏�${title}',
defaultValue: 0
- },
+ }, */
{
title: '澶囦欢id',
key: 'sparePartId',
@@ -460,13 +459,13 @@
this.$emit('close')
this.$refs.form.clearValidate()
},
- changeAuxiliaryQuantity(target){
+/* changeAuxiliaryQuantity(target){
console.log(target.columnIndex)
let num=target.columnIndex
if (target.columnIndex ===num){
target.row.auxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.mainQuantity)
}
- }
+ } */
}
}
</script>
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
index a0d3da1..f94b14a 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareRequirementSelectModal.vue
@@ -38,19 +38,19 @@
</a-row>
<a-row style='width: 100%'>
<a-col :span='12'>
- <a-form-model-item label='涓诲崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
+ <a-form-model-item label='鍗曚綅' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='mainUnitId'>
<!-- <a-input v-model='model.mainUnitId' placeholder='璇疯緭鍏ヤ富鍗曚綅' />-->
<j-dict-select-tag
allow-clear
- :placeholder="'璇烽�夋嫨涓诲崟浣�'"
+ :placeholder="'璇烽�夋嫨鍗曚綅'"
v-model='model.departId'
dictCode="mom_base_unit,name,id,del_flag!='1'"
/>
</a-form-model-item>
</a-col>
- <a-col :span='12'>
+<!-- <a-col :span='12'>
<a-form-model-item label='杈呭崟浣�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='auxiliaryUnitId'>
- <!-- <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />-->
+ <!– <a-input v-model='model.auxiliaryUnitId' placeholder='璇疯緭鍏ヨ緟鍗曚綅' />–>
<j-dict-select-tag
allow-clear
:placeholder="'璇烽�夋嫨杈呭崟浣�'"
@@ -58,7 +58,7 @@
dictCode="mom_base_unit,name,id,del_flag!='1'"
/>
</a-form-model-item>
- </a-col>
+ </a-col>-->
</a-row>
<a-row style='width: 100%'>
<a-col :span='12'>
diff --git a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
index 99045bd..7a030a3 100644
--- a/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
+++ b/src/views/spare/modules/sparePartScrapRequirement/SpareSelectList.vue
@@ -118,20 +118,20 @@
width: 150
},
- {
+ /* {
title: '杈呭崟浣�',
align: 'center',
dataIndex: 'auxiliaryUnitId_dictText',
width: 150
- },
- {
+ }, */
+ /* {
title: '鎹㈢畻姣斾緥',
align: 'center',
width: 100,
dataIndex: 'conversionRatio'
- }
+ } */
],
selectedRowKeys: [],
--
Gitblit v1.9.3