|
@@ -22,7 +22,7 @@
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplier" name="supplier">
|
|
|
- <a-input v-model:value="formData.supplierName" placeholder="请选择" allow-clear ></a-input>
|
|
|
+ <a-input v-model:value="formData.supplierName" placeholder="请选择" allow-clear ></a-input>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
@@ -32,7 +32,16 @@
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-productionClass" name="productionClass">
|
|
|
- <a-input v-model:value="formData.productionClass" placeholder="请输入" allow-clear disabled ></a-input>
|
|
|
+ <ApiSelect
|
|
|
+ :api="ClassList"
|
|
|
+ showSearch
|
|
|
+ v-model:value="formData.productionClass"
|
|
|
+ optionFilterProp="label"
|
|
|
+ resultField="records"
|
|
|
+ labelField="name"
|
|
|
+ valueField="id"
|
|
|
+ disabled
|
|
|
+ />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
@@ -182,7 +191,7 @@
|
|
|
import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
|
|
|
import { defHttp } from '/@/utils/http/axios';
|
|
|
import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
|
|
|
- import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId} from '../PurchaseOrderyForm.api';
|
|
|
+ import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId,ClassList, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId} from '../PurchaseOrderyForm.api';
|
|
|
import { JVxeTable } from '/@/components/jeecg/JVxeTable';
|
|
|
import {purchaseOrderShipColumns, purchaseOrderProductColumns} from '../PurchaseOrderForm.data';
|
|
|
import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
|
|
@@ -196,6 +205,7 @@
|
|
|
import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
|
|
|
import { Form, message } from 'ant-design-vue';
|
|
|
import { useUserStore } from '/@/store/modules/user';
|
|
|
+ import { ApiSelect, } from '/@/components/Form/index';
|
|
|
import moment from 'moment';
|
|
|
const useForm = Form.useForm;
|
|
|
export default defineComponent({
|
|
@@ -210,7 +220,8 @@
|
|
|
SelectProjectModal,
|
|
|
BaseShipArchiveAccessoriesModal,
|
|
|
SelectSupplierQuotationModal,
|
|
|
- SelectSaleOrderModal
|
|
|
+ SelectSaleOrderModal,
|
|
|
+ ApiSelect
|
|
|
},
|
|
|
props:{
|
|
|
formDisabled:{
|
|
@@ -463,7 +474,6 @@
|
|
|
})
|
|
|
}
|
|
|
function addFromQuotation(data){
|
|
|
-
|
|
|
data.map(item=>{
|
|
|
item.model = item.childModel
|
|
|
item.sourceId = 'Quo'+item.childId
|
|
@@ -490,6 +500,7 @@
|
|
|
item.model = item.childModel
|
|
|
item.sourceId = 'Con'+item.childId
|
|
|
item.sourceCode =data[0].billCode
|
|
|
+ // item.productClass =data[0].productClass
|
|
|
})
|
|
|
var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
|
|
|
purOrderFormShipFormProductTable.dataSource=arrProduct
|
|
@@ -604,7 +615,8 @@
|
|
|
addFromQuotation,
|
|
|
notAllowEdit,
|
|
|
selectSaleOrderList,
|
|
|
- addFormSaleOrder
|
|
|
+ addFormSaleOrder,
|
|
|
+ ClassList
|
|
|
}
|
|
|
}
|
|
|
});
|