|
|
@@ -348,8 +348,8 @@
|
|
|
style="width: 200px"
|
|
|
placeholder="请选择业务员">
|
|
|
<a-select-option v-for="item in businesserList"
|
|
|
- :key="item.loginid"
|
|
|
- :value="item.loginid">
|
|
|
+ :key="item.userid"
|
|
|
+ :value="item.userid">
|
|
|
{{item.accountname}}-{{item.logincode}}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
@@ -365,8 +365,8 @@
|
|
|
style="width: 200px"
|
|
|
placeholder="请选择跟单员">
|
|
|
<a-select-option v-for="item in merchandiserList"
|
|
|
- :key="item.loginid"
|
|
|
- :value="item.loginid">
|
|
|
+ :key="item.userid"
|
|
|
+ :value="item.userid">
|
|
|
{{item.accountname}}-{{item.logincode}}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
@@ -480,7 +480,7 @@ export default defineComponent({
|
|
|
queryTradeManager();
|
|
|
mergeTwoObj(formState, props.selectedRow);
|
|
|
isSell.value = formState.ContractType === 1 ? false : true;
|
|
|
- const { deliverygoodsid, qty, price, wrstandardid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate } = props.selectedRow;
|
|
|
+ const { deliverygoodsid, qty, price, wrstandardid, spotgoodsbrandid, currencyid, attachment, deliverystartdate, deliveryenddate, startdate, enddate, meruserid, tradeuserid } = props.selectedRow;
|
|
|
if (deliverygoodsid) {
|
|
|
deliveryGoodsChange(deliverygoodsid);
|
|
|
if (wrstandardid) {
|
|
|
@@ -493,6 +493,8 @@ export default defineComponent({
|
|
|
formState.Price = price.toString();
|
|
|
formState.CurrencyID = currencyid;
|
|
|
formState.ContractAttachment = attachment;
|
|
|
+ formState.MerUserID = meruserid;
|
|
|
+ formState.TradeUserID = tradeuserid;
|
|
|
if (deliverystartdate) {
|
|
|
deliveryDate.value.push(moment(deliverystartdate));
|
|
|
}
|
huangbin