|
@@ -38,7 +38,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
@change="contractChange"
|
|
@change="contractChange"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.ContractType"
|
|
v-model:value="formState.ContractType"
|
|
|
placeholder="请选择合同类型">
|
|
placeholder="请选择合同类型">
|
|
|
<a-select-option v-for="item in contractType"
|
|
<a-select-option v-for="item in contractType"
|
|
@@ -54,7 +54,7 @@
|
|
|
name="BizType">
|
|
name="BizType">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.BizType"
|
|
v-model:value="formState.BizType"
|
|
|
placeholder="请选择业务类型">
|
|
placeholder="请选择业务类型">
|
|
|
<a-select-option v-for="item in businessType"
|
|
<a-select-option v-for="item in businessType"
|
|
@@ -71,7 +71,7 @@
|
|
|
name="BuyUserID">
|
|
name="BuyUserID">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.BuyUserID"
|
|
v-model:value="formState.BuyUserID"
|
|
|
placeholder="请选择客户">
|
|
placeholder="请选择客户">
|
|
|
<!-- 客户资料列表 正常 -->
|
|
<!-- 客户资料列表 正常 -->
|
|
@@ -101,7 +101,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
v-model:value="formState.SellUserID"
|
|
v-model:value="formState.SellUserID"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
placeholder="请选择客户">
|
|
placeholder="请选择客户">
|
|
|
<!-- 客户资料列表 正常 -->
|
|
<!-- 客户资料列表 正常 -->
|
|
|
<a-select-option :value="item.userid"
|
|
<a-select-option :value="item.userid"
|
|
@@ -132,7 +132,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
@change="deliveryGoodsChange"
|
|
@change="deliveryGoodsChange"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.DeliveryGoodsID"
|
|
v-model:value="formState.DeliveryGoodsID"
|
|
|
placeholder="请选择现货品种">
|
|
placeholder="请选择现货品种">
|
|
|
<a-select-option v-for="item in deliveryGoodsList"
|
|
<a-select-option v-for="item in deliveryGoodsList"
|
|
@@ -148,7 +148,7 @@
|
|
|
name="WrStandardID">
|
|
name="WrStandardID">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
@change="WrStandardChange"
|
|
@change="WrStandardChange"
|
|
|
v-model:value="formState.WrStandardID"
|
|
v-model:value="formState.WrStandardID"
|
|
|
placeholder="请选择品类">
|
|
placeholder="请选择品类">
|
|
@@ -165,7 +165,7 @@
|
|
|
name="SpotGoodsBrandID">
|
|
name="SpotGoodsBrandID">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.SpotGoodsBrandID"
|
|
v-model:value="formState.SpotGoodsBrandID"
|
|
|
placeholder="请选择品牌">
|
|
placeholder="请选择品牌">
|
|
|
<a-select-option v-for="item in gblist"
|
|
<a-select-option v-for="item in gblist"
|
|
@@ -205,7 +205,7 @@
|
|
|
name="PriceType">
|
|
name="PriceType">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.PriceType"
|
|
v-model:value="formState.PriceType"
|
|
|
placeholder="请选择定价类型">
|
|
placeholder="请选择定价类型">
|
|
|
<a-select-option v-for="item in priceType"
|
|
<a-select-option v-for="item in priceType"
|
|
@@ -222,7 +222,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
v-model:value="formState.CurrencyID"
|
|
v-model:value="formState.CurrencyID"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
placeholder="请选择结算币种">
|
|
placeholder="请选择结算币种">
|
|
|
<a-select-option v-for="item in payCurrency"
|
|
<a-select-option v-for="item in payCurrency"
|
|
|
:key="item.enumdicid"
|
|
:key="item.enumdicid"
|
|
@@ -260,7 +260,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
v-model:value="formState.GoodsID"
|
|
v-model:value="formState.GoodsID"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
placeholder="请选择点价合约">
|
|
placeholder="请选择点价合约">
|
|
|
<a-select-option v-for="item in goodsList"
|
|
<a-select-option v-for="item in goodsList"
|
|
|
:key="item.goodsid"
|
|
:key="item.goodsid"
|
|
@@ -358,7 +358,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
v-model:value="formState.SaleUserID"
|
|
v-model:value="formState.SaleUserID"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
placeholder="请选择业务员">
|
|
placeholder="请选择业务员">
|
|
|
<a-select-option v-for="item in businesserList"
|
|
<a-select-option v-for="item in businesserList"
|
|
|
:key="item.loginid"
|
|
:key="item.loginid"
|
|
@@ -376,7 +376,7 @@
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
v-model:value="formState.MerUserID"
|
|
v-model:value="formState.MerUserID"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
placeholder="请选择跟单员">
|
|
placeholder="请选择跟单员">
|
|
|
<a-select-option v-for="item in merchandiserList"
|
|
<a-select-option v-for="item in merchandiserList"
|
|
|
:key="item.loginid"
|
|
:key="item.loginid"
|
|
@@ -391,7 +391,7 @@
|
|
|
name="TradeUserID">
|
|
name="TradeUserID">
|
|
|
<a-select class="inlineFormSelect"
|
|
<a-select class="inlineFormSelect"
|
|
|
style="width: 200px"
|
|
style="width: 200px"
|
|
|
- :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
|
|
|
|
+ :getPopupContainer="(triggerNode) => triggerNode.parentNode"
|
|
|
v-model:value="formState.TradeUserID"
|
|
v-model:value="formState.TradeUserID"
|
|
|
placeholder="请选择期货账户">
|
|
placeholder="请选择期货账户">
|
|
|
<a-select-option v-for="item in traderList"
|
|
<a-select-option v-for="item in traderList"
|
|
@@ -475,7 +475,7 @@ export default defineComponent({
|
|
|
const merchandiserList = ref<ErmcpLoginUser[]>([]);
|
|
const merchandiserList = ref<ErmcpLoginUser[]>([]);
|
|
|
// 现货商品列表
|
|
// 现货商品列表
|
|
|
const goodsList = ref<Goods[]>([]);
|
|
const goodsList = ref<Goods[]>([]);
|
|
|
- const { imgs, uploadImgAction } = getUploadImg();
|
|
|
|
|
|
|
+ const { getFirstImg, uploadImgAction } = getUploadImg();
|
|
|
watchEffect(() => {
|
|
watchEffect(() => {
|
|
|
if (visible.value) {
|
|
if (visible.value) {
|
|
|
queryCustomList();
|
|
queryCustomList();
|
|
@@ -512,9 +512,7 @@ export default defineComponent({
|
|
|
Object.assign(param, { StartDate, EndDate });
|
|
Object.assign(param, { StartDate, EndDate });
|
|
|
}
|
|
}
|
|
|
// 合同附件
|
|
// 合同附件
|
|
|
- if (imgs.value.length) {
|
|
|
|
|
- param.ContractAttachment = imgs.value[0];
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ param.ContractAttachment = getFirstImg();
|
|
|
sendReq(param, loading, OperateType)
|
|
sendReq(param, loading, OperateType)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
context.emit('refresh');
|
|
context.emit('refresh');
|