Commit 2de222d2 authored by LeeJiancong's avatar LeeJiancong

'对接需求单列表操作'

parent 11e7af7d
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
* @Date: 2020-08-24 11:39:11 * @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com * @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-10 11:42:28 * @LastEditTime: 2020-09-16 16:28:24
*/ */
/** /**
* @description: 组件描述: 一级 二级 待提交需求 * @description: 组件描述: 一级 二级 待提交报价
* @param {type} * @param {type}
* @return {type} * @return {type}
*/ */
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2020-08-28 10:07:45 * @Date: 2020-08-28 10:07:45
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com * @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-16 14:23:28 * @LastEditTime: 2020-09-16 16:46:52
*/ */
import React, { Component, useState,useRef, useEffect,useImperativeHandle } from 'react'; import React, { Component, useState,useRef, useEffect,useImperativeHandle } from 'react';
import { Modal, Button,Space, Form, Radio, AutoComplete, Badge,Tabs, Input, Select, Checkbox } from 'antd' import { Modal, Button,Space, Form, Radio, AutoComplete, Badge,Tabs, Input, Select, Checkbox } from 'antd'
...@@ -120,7 +120,7 @@ const columns: ColumnType<any>[] = [ ...@@ -120,7 +120,7 @@ const columns: ColumnType<any>[] = [
const comfirmDialog: React.FC<Params> = (props,{onRef}) => { const comfirmDialog: React.FC<Params> = (props,{onRef}) => {
// const {onRef} = props // const {onRef} = props
// const cRef = props.currentRef // const cRef = props.currentRef
console.log('数据',props) // console.log('数据',props)
const [visible, setsVisible] = useState(false) //state hook写法 const [visible, setsVisible] = useState(false) //state hook写法
...@@ -152,7 +152,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => { ...@@ -152,7 +152,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => {
} }
const handleSelectOk = () => { const handleSelectOk = () => {
console.log('数据', productRowCtl);
const selectRow = productRowCtl.selectRow[0] const selectRow = productRowCtl.selectRow[0]
let { commodityId, id,customerCategoryName, goodsId, roleId, name, brandName } = selectRow let { commodityId, id,customerCategoryName, goodsId, roleId, name, brandName } = selectRow
Curform.setFieldsValue({ Curform.setFieldsValue({
...@@ -191,7 +190,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => { ...@@ -191,7 +190,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => {
*/ */
const handletOk = () => { const handletOk = () => {
Curform.validateFields().then(v => { Curform.validateFields().then(v => {
console.log('表单', v)
props.onOK(v,commodityAttributedataSource) props.onOK(v,commodityAttributedataSource)
props.productAttributeJson(commodityAttributedataSource) props.productAttributeJson(commodityAttributedataSource)
Curform.resetFields() Curform.resetFields()
...@@ -202,7 +200,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => { ...@@ -202,7 +200,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => {
// onRef(inRef) // onRef(inRef)
if( id && props.mode == 0){//新增重置 if( id && props.mode == 0){//新增重置
console.log(31212)
Curform.setFieldsValue({ Curform.setFieldsValue({
model:'', model:'',
productId:'', productId:'',
...@@ -214,7 +211,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => { ...@@ -214,7 +211,6 @@ const comfirmDialog: React.FC<Params> = (props,{onRef}) => {
} }
}, []) }, [])
useEffect(() => { useEffect(() => {
console.log('重置',props.mode)
if(props.initialValues && props.initialValues.productId){ if(props.initialValues && props.initialValues.productId){
GetCommodityAttribute(props.initialValues.productId) GetCommodityAttribute(props.initialValues.productId)
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:29 * @Date: 2020-08-24 11:39:29
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com * @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-16 14:25:16 * @LastEditTime: 2020-09-16 17:36:39
*/ */
import React, { Component, useState, useEffect,useRef } from 'react' import React, { Component, useState, useEffect,useRef } from 'react'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
...@@ -881,16 +881,9 @@ const Detail: React.FC<{}> = () => { ...@@ -881,16 +881,9 @@ const Detail: React.FC<{}> = () => {
*/ */
const handleSubmitTabForm = () => { const handleSubmitTabForm = () => {
tabForm.validateFields().then(values => { tabForm.validateFields().then(values => {
console.log('valiue', values) console.log('valiue', values)
values['requisitionFormId'] = requisitionFormId values['requisitionFormId'] = requisitionFormId
if(id){ values['demandMembers'] = getAuth().name || ''
}else{
}
let productList = [] let productList = []
productSource.forEach((v) => { productSource.forEach((v) => {
let item: any = {} let item: any = {}
...@@ -920,7 +913,6 @@ const Detail: React.FC<{}> = () => { ...@@ -920,7 +913,6 @@ const Detail: React.FC<{}> = () => {
console.log('item', item) console.log('item', item)
}) })
values['quoteDetailss'] = [...productList] values['quoteDetailss'] = [...productList]
console.log('valse',values)
console.log('valse',JSON.stringify(values)) console.log('valse',JSON.stringify(values))
if (id) {//修改 if (id) {//修改
values['id'] = id values['id'] = id
...@@ -1081,6 +1073,7 @@ const Detail: React.FC<{}> = () => { ...@@ -1081,6 +1073,7 @@ const Detail: React.FC<{}> = () => {
* @return {type} * @return {type}
*/ */
const getOrderProductAll = (id) => { const getOrderProductAll = (id) => {
setrequisitionFormId(id)//需求id
PublicApi.getOrderRequisitionFormProductAll({id:id}).then(res => { PublicApi.getOrderRequisitionFormProductAll({id:id}).then(res => {
if(res.code === 1000){ if(res.code === 1000){
let {data} = res || {} let {data} = res || {}
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Date: 2020-08-24 11:39:11 * @Date: 2020-08-24 11:39:11
* @LastEditors: LeeJiancong * @LastEditors: LeeJiancong
* @Copyright: 1549414730@qq.com * @Copyright: 1549414730@qq.com
* @LastEditTime: 2020-09-15 14:11:15 * @LastEditTime: 2020-09-16 16:14:31
*/ */
import React, { ReactNode, useRef, useState,useEffect } from 'react'; import React, { ReactNode, useRef, useState,useEffect } from 'react';
import { history } from 'umi'; import { history } from 'umi';
...@@ -132,7 +132,7 @@ const List:React.FC<{}> = () => { ...@@ -132,7 +132,7 @@ const List:React.FC<{}> = () => {
) )
} }
{ {
(record.externalState === 1 && record.interiorState === 1) && (record.interiorState === 1) &&
<> <>
<Popconfirm title="确定要删除吗?" okText="是" cancelText="否" onConfirm={() => handleDelete([record.id])}> <Popconfirm title="确定要删除吗?" okText="是" cancelText="否" onConfirm={() => handleDelete([record.id])}>
<Button type='link'> <Button type='link'>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment