|
|
@@ -41,21 +41,21 @@
|
|
|
<a-select class="inlineFormSelect" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" v-model:value="formState.BuyUserID" placeholder="请选择客户">
|
|
|
<!-- 客户资料列表 正常 -->
|
|
|
<a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
|
|
|
- {{ item.customername }}
|
|
|
+ {{ item.nickname }}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
<a-form-item label="销售方">
|
|
|
- <span class="white">{{ getRootUserInfo().accountname }}</span>
|
|
|
+ <span class="white">{{ getRootUserInfo().nickname ?? getRootUserInfo().accountname }}</span>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<a-col :span="12">
|
|
|
<a-form-item label="采购方">
|
|
|
- <span class="white">{{ getRootUserInfo().accountname }}</span>
|
|
|
+ <span class="white">{{ getRootUserInfo().nickname ?? getRootUserInfo().accountname }}</span>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :span="12">
|
|
|
@@ -63,7 +63,7 @@
|
|
|
<a-select class="inlineFormSelect" v-model:value="formState.SellUserID" style="width: 200px" :getPopupContainer="(triggerNode) => triggerNode.parentNode" placeholder="请选择客户">
|
|
|
<!-- 客户资料列表 正常 -->
|
|
|
<a-select-option :value="item.userid" v-for="item in customList" :key="item.userid">
|
|
|
- {{ item.customername }}
|
|
|
+ {{ item.nickname }}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
@@ -266,138 +266,138 @@ import { _closeModal } from '@/common/setup/modal/modal';
|
|
|
import { getContractTypeName } from '@/common/constants/enumsName';
|
|
|
|
|
|
export default defineComponent({
|
|
|
- name: 'add-spot-contract',
|
|
|
- components: { UploadImg },
|
|
|
- emits: ['cancel', 'update'],
|
|
|
- props: {
|
|
|
- selectedRow: {
|
|
|
- type: Object as PropType<Ermcp3ContractRsp>,
|
|
|
- default: {},
|
|
|
- },
|
|
|
- contractType: {
|
|
|
- type: Number,
|
|
|
- required: true,
|
|
|
- },
|
|
|
+ name: 'add-spot-contract',
|
|
|
+ components: { UploadImg },
|
|
|
+ emits: ['cancel', 'update'],
|
|
|
+ props: {
|
|
|
+ selectedRow: {
|
|
|
+ type: Object as PropType<Ermcp3ContractRsp>,
|
|
|
+ default: {},
|
|
|
},
|
|
|
- setup(props, context) {
|
|
|
- const { visible, cancel } = _closeModal(context);
|
|
|
- const { sendReq } = addContractReq();
|
|
|
- const loading = ref<boolean>(false);
|
|
|
-
|
|
|
- // 表单
|
|
|
- const formRef = ref();
|
|
|
- const { formState, businessType, initFormData } = handleFromState(props.contractType);
|
|
|
- const { rules } = handleFormRule(formState);
|
|
|
- // 合同类型
|
|
|
- const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
|
|
|
+ contractType: {
|
|
|
+ type: Number,
|
|
|
+ required: true,
|
|
|
+ },
|
|
|
+ },
|
|
|
+ setup(props, context) {
|
|
|
+ const { visible, cancel } = _closeModal(context);
|
|
|
+ const { sendReq } = addContractReq();
|
|
|
+ const loading = ref<boolean>(false);
|
|
|
|
|
|
- // 处理现货商品
|
|
|
- const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, WrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
|
|
|
- // 价格信息
|
|
|
- const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
|
|
|
- // 日期
|
|
|
- const { deliveryDate, priceDate, disabledDate } = handleDate();
|
|
|
- // 处理金额
|
|
|
- const { getAmout } = handleAmout(formState);
|
|
|
- // 获取 业务账户
|
|
|
- const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
|
|
|
- const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
|
|
|
- // 业务员
|
|
|
- const businesserList = ref<ErmcpLoginUser[]>([]);
|
|
|
- // 跟单员
|
|
|
- const merchandiserList = ref<ErmcpLoginUser[]>([]);
|
|
|
- const { getFirstImg, uploadImgAction } = getUploadImg();
|
|
|
+ // 表单
|
|
|
+ const formRef = ref();
|
|
|
+ const { formState, businessType, initFormData } = handleFromState(props.contractType);
|
|
|
+ const { rules } = handleFormRule(formState);
|
|
|
+ // 合同类型
|
|
|
+ const { contractType, isSell, contractChange, customList, queryCustomList } = handleContract(formState);
|
|
|
|
|
|
- // 交易主体列表
|
|
|
- const subjectList = ref<Ermcp3SubjectRsp[]>([]);
|
|
|
- QueryPaAreaSubject().then((res) => {
|
|
|
- subjectList.value = res.filter((item) => item.subjectstatus === 1);
|
|
|
- });
|
|
|
+ // 处理现货商品
|
|
|
+ const { deliveryGoodsList, barandList, wrstandardList, goodsList, numberUnit, WrStandardChange, deliveryGoodsChange } = handleDeliveryGoods(formState);
|
|
|
+ // 价格信息
|
|
|
+ const { priceType, payCurrency, payCurrencyUnit, parCurrencyChange } = handlePrice(formState);
|
|
|
+ // 日期
|
|
|
+ const { deliveryDate, priceDate, disabledDate } = handleDate();
|
|
|
+ // 处理金额
|
|
|
+ const { getAmout } = handleAmout(formState);
|
|
|
+ // 获取 业务账户
|
|
|
+ const { queryTable: queryBusinessManager, getBusinesserOrMerchandiser } = handlerManagerList(loading, 1);
|
|
|
+ const { tableList: traderList, queryTable: queryTradeManager } = handlerManagerList(loading, 2, true);
|
|
|
+ // 业务员
|
|
|
+ const businesserList = ref<ErmcpLoginUser[]>([]);
|
|
|
+ // 跟单员
|
|
|
+ const merchandiserList = ref<ErmcpLoginUser[]>([]);
|
|
|
+ const { getFirstImg, uploadImgAction } = getUploadImg();
|
|
|
|
|
|
- queryCustomList();
|
|
|
- queryTradeManager();
|
|
|
- queryBusinessManager().then(() => {
|
|
|
- businesserList.value = getBusinesserOrMerchandiser('22');
|
|
|
- merchandiserList.value = getBusinesserOrMerchandiser('23');
|
|
|
- });
|
|
|
- function submit(OperateType: 1 | 2) {
|
|
|
- validateAction<FormState>(formRef, formState).then((param) => {
|
|
|
- const id = getUserId();
|
|
|
- isSell.value ? (param.SellUserID = id) : (param.BuyUserID = id);
|
|
|
- const fn = (value: Moment) => {
|
|
|
- return formatTime(value, 'd') + ' ' + '00:00:00';
|
|
|
- };
|
|
|
- // 交收期
|
|
|
- const dDate = deliveryDate.value;
|
|
|
- if (dDate.length) {
|
|
|
- const DeliveryStartDate = fn(dDate[0]);
|
|
|
- const DeliveryEndDate = fn(dDate[1]);
|
|
|
- Object.assign(param, { DeliveryStartDate, DeliveryEndDate });
|
|
|
- }
|
|
|
+ // 交易主体列表
|
|
|
+ const subjectList = ref<Ermcp3SubjectRsp[]>([]);
|
|
|
+ QueryPaAreaSubject().then((res) => {
|
|
|
+ subjectList.value = res.filter((item) => item.subjectstatus === 1);
|
|
|
+ });
|
|
|
|
|
|
- // 点价期
|
|
|
- const pDate = priceDate.value;
|
|
|
- if (pDate.length && param.PriceType !== 1) {
|
|
|
- // 点价日期[2:点价3:暂定价]
|
|
|
- const StartDate = fn(pDate[0]);
|
|
|
- const EndDate = fn(pDate[1]);
|
|
|
- Object.assign(param, { StartDate, EndDate });
|
|
|
- }
|
|
|
- // 合同附件
|
|
|
- param.ContractAttachment = getFirstImg();
|
|
|
- sendReq(param, loading, OperateType)
|
|
|
- .then((res) => {
|
|
|
- cancel(true);
|
|
|
- })
|
|
|
- .catch((err) => {});
|
|
|
- });
|
|
|
+ queryCustomList();
|
|
|
+ queryTradeManager();
|
|
|
+ queryBusinessManager().then(() => {
|
|
|
+ businesserList.value = getBusinesserOrMerchandiser('22');
|
|
|
+ merchandiserList.value = getBusinesserOrMerchandiser('23');
|
|
|
+ });
|
|
|
+ function submit(OperateType: 1 | 2) {
|
|
|
+ validateAction<FormState>(formRef, formState).then((param) => {
|
|
|
+ const id = getUserId();
|
|
|
+ isSell.value ? (param.SellUserID = id) : (param.BuyUserID = id);
|
|
|
+ const fn = (value: Moment) => {
|
|
|
+ return formatTime(value, 'd') + ' ' + '00:00:00';
|
|
|
+ };
|
|
|
+ // 交收期
|
|
|
+ const dDate = deliveryDate.value;
|
|
|
+ if (dDate.length) {
|
|
|
+ const DeliveryStartDate = fn(dDate[0]);
|
|
|
+ const DeliveryEndDate = fn(dDate[1]);
|
|
|
+ Object.assign(param, { DeliveryStartDate, DeliveryEndDate });
|
|
|
}
|
|
|
|
|
|
- function closeAction() {
|
|
|
- //清空添加成功后的数据，确保在此新增打开是个空数据
|
|
|
- Object.assign(formState, initFormData());
|
|
|
- cancel();
|
|
|
+ // 点价期
|
|
|
+ const pDate = priceDate.value;
|
|
|
+ if (pDate.length && param.PriceType !== 1) {
|
|
|
+ // 点价日期[2:点价3:暂定价]
|
|
|
+ const StartDate = fn(pDate[0]);
|
|
|
+ const EndDate = fn(pDate[1]);
|
|
|
+ Object.assign(param, { StartDate, EndDate });
|
|
|
}
|
|
|
+ // 合同附件
|
|
|
+ param.ContractAttachment = getFirstImg();
|
|
|
+ sendReq(param, loading, OperateType)
|
|
|
+ .then((res) => {
|
|
|
+ cancel(true);
|
|
|
+ })
|
|
|
+ .catch((err) => { });
|
|
|
+ });
|
|
|
+ }
|
|
|
|
|
|
- return {
|
|
|
- visible,
|
|
|
- closeAction,
|
|
|
- submit,
|
|
|
- formRef,
|
|
|
- loading,
|
|
|
- maskClosableFlag: false,
|
|
|
- formState,
|
|
|
- rules,
|
|
|
- businessType,
|
|
|
- contractType,
|
|
|
- isSell,
|
|
|
- contractChange,
|
|
|
- customList,
|
|
|
- deliveryGoodsList,
|
|
|
- barandList,
|
|
|
- wrstandardList,
|
|
|
- goodsList,
|
|
|
- deliveryGoodsChange,
|
|
|
- WrStandardChange,
|
|
|
- priceType,
|
|
|
- payCurrency,
|
|
|
- payCurrencyUnit,
|
|
|
- parCurrencyChange,
|
|
|
- numberUnit,
|
|
|
- getUserName,
|
|
|
- deliveryDate,
|
|
|
- priceDate,
|
|
|
- disabledDate,
|
|
|
- getAmout,
|
|
|
- traderList,
|
|
|
- businesserList,
|
|
|
- merchandiserList,
|
|
|
- uploadImgAction,
|
|
|
- getRootUserInfo,
|
|
|
- subjectList,
|
|
|
- getContractTypeName,
|
|
|
- };
|
|
|
- },
|
|
|
+ function closeAction() {
|
|
|
+ //清空添加成功后的数据，确保在此新增打开是个空数据
|
|
|
+ Object.assign(formState, initFormData());
|
|
|
+ cancel();
|
|
|
+ }
|
|
|
+
|
|
|
+ return {
|
|
|
+ visible,
|
|
|
+ closeAction,
|
|
|
+ submit,
|
|
|
+ formRef,
|
|
|
+ loading,
|
|
|
+ maskClosableFlag: false,
|
|
|
+ formState,
|
|
|
+ rules,
|
|
|
+ businessType,
|
|
|
+ contractType,
|
|
|
+ isSell,
|
|
|
+ contractChange,
|
|
|
+ customList,
|
|
|
+ deliveryGoodsList,
|
|
|
+ barandList,
|
|
|
+ wrstandardList,
|
|
|
+ goodsList,
|
|
|
+ deliveryGoodsChange,
|
|
|
+ WrStandardChange,
|
|
|
+ priceType,
|
|
|
+ payCurrency,
|
|
|
+ payCurrencyUnit,
|
|
|
+ parCurrencyChange,
|
|
|
+ numberUnit,
|
|
|
+ getUserName,
|
|
|
+ deliveryDate,
|
|
|
+ priceDate,
|
|
|
+ disabledDate,
|
|
|
+ getAmout,
|
|
|
+ traderList,
|
|
|
+ businesserList,
|
|
|
+ merchandiserList,
|
|
|
+ uploadImgAction,
|
|
|
+ getRootUserInfo,
|
|
|
+ subjectList,
|
|
|
+ getContractTypeName,
|
|
|
+ };
|
|
|
+ },
|
|
|
});
|
|
|
</script>
|
|
|
|
