|
|
@@ -135,8 +135,6 @@
|
|
|
<!-- table区域-end -->
|
|
|
|
|
|
</a-card>
|
|
|
- <materialProcurementAdd ref="materialProcurementAdd" @ok='getTableList'></materialProcurementAdd>
|
|
|
- <materialProcurementDetail ref="materialProcurementDetail" ></materialProcurementDetail>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -146,8 +144,6 @@
|
|
|
import moment from 'dayjs'
|
|
|
import { httpAction ,getAction,postAction,putAction,deleteAction,downFile} from '@/api/manage'
|
|
|
import {queryDepartTreeList} from '@/api/api'
|
|
|
- import materialProcurementAdd from './modules/materialProcurementAdd'
|
|
|
- import materialProcurementDetail from './modules/materialProcurementDetail'
|
|
|
import alertModal from '../../../plugins/modal'
|
|
|
import { Message } from "element-ui";
|
|
|
//---------workflow by fhf end -------------
|
|
|
@@ -155,8 +151,6 @@
|
|
|
name: "materialProcurementList",
|
|
|
mixins: [JeecgListMixin],
|
|
|
components: {
|
|
|
- materialProcurementAdd,
|
|
|
- materialProcurementDetail
|
|
|
},
|
|
|
data () {
|
|
|
return {
|
|
|
@@ -343,8 +337,7 @@
|
|
|
},
|
|
|
//新增
|
|
|
addList(){
|
|
|
- this.$refs.materialProcurementAdd.visible=true
|
|
|
- this.$refs.materialProcurementAdd.defaultMethod='add'
|
|
|
+
|
|
|
},
|
|
|
//编辑
|
|
|
addEdit(){
|
|
|
@@ -353,11 +346,7 @@
|
|
|
}else if(this.selectedRowKeys.length>1){
|
|
|
this.$message.warning('请选择一条数据！')
|
|
|
}else{
|
|
|
- this.$refs.materialProcurementAdd.visible=true
|
|
|
- this.$refs.materialProcurementAdd.defaultMethod='edit'
|
|
|
- this.$refs.materialProcurementAdd.visible=true
|
|
|
- //获取主表信息
|
|
|
- this.$refs.materialProcurementAdd.getMainData(this.selectedRowKeys[0])
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
//审批
|
|
|
@@ -525,9 +514,7 @@
|
|
|
return {
|
|
|
on: {
|
|
|
dblclick: () => {
|
|
|
- this.$refs.materialProcurementDetail.visible=true
|
|
|
- //获取主表信息
|
|
|
- this.$refs.materialProcurementDetail.getMainData(record.id)
|
|
|
+
|
|
|
},
|
|
|
}
|
|
|
}
|
