|
|
@@ -221,7 +221,7 @@
|
|
|
placeholder="请选择结算币种">
|
|
|
<a-select-option v-for="item in payCurrency"
|
|
|
:key="item.enumdicid"
|
|
|
- :value="item.enumdicname">
|
|
|
+ :value="item.enumdicid">
|
|
|
{{item.enumdicname}}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
@@ -321,21 +321,6 @@
|
|
|
:disabled-date="disabledDate"
|
|
|
:show-time="{hideDisabledOptions: true}"
|
|
|
format="YYYY-MM-DD" />
|
|
|
- <!-- <a-select class="inlineFormSelect"
|
|
|
- style="width: 95px"
|
|
|
- placeholder="请选择定价类型">
|
|
|
- <a-select-option value="1">
|
|
|
- 日期一
|
|
|
- </a-select-option>
|
|
|
- </a-select>
|
|
|
- <span class="to">-</span>
|
|
|
- <a-select class="inlineFormSelect"
|
|
|
- style="width: 95px"
|
|
|
- placeholder="请选择定价类型">
|
|
|
- <a-select-option value="1">
|
|
|
- 日期二
|
|
|
- </a-select-option>
|
|
|
- </a-select> -->
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</template>
|
|
|
@@ -415,15 +400,7 @@
|
|
|
import { defineComponent, ref, toRaw } from 'vue';
|
|
|
import { closeModal } from '@/common/setup/modal/index';
|
|
|
import { initData } from '@/common/methods';
|
|
|
-import {
|
|
|
- handleFromState,
|
|
|
- handleContract,
|
|
|
- handlevalidate,
|
|
|
- handleDeliveryGoods,
|
|
|
- handlePrice,
|
|
|
- handleDate,
|
|
|
- addContractReq
|
|
|
-} from './setup';
|
|
|
+import { handleFromState, handleContract, handlevalidate, handleDeliveryGoods, handlePrice, handleDate, addContractReq } from './setup';
|
|
|
import { getUserName } from '@/services/bus/user';
|
|
|
import { getGoodsList } from '@/services/bus/goods';
|
|
|
import { Goods } from '@/services/go/ermcp/goodsInfo/interface';
|
|
|
@@ -436,7 +413,7 @@ export default defineComponent({
|
|
|
components: {},
|
|
|
setup() {
|
|
|
const { visible, cancel } = closeModal('spot_contract_btn_add');
|
|
|
- const {loading, sendReq} = addContractReq();
|
|
|
+ const { loading, sendReq } = addContractReq();
|
|
|
|
|
|
// 表单
|
|
|
const formRef = ref();
|
|
|
@@ -477,10 +454,6 @@ export default defineComponent({
|
|
|
.then(() => {
|
|
|
const param = toRaw(formState);
|
|
|
|
|
|
- // console.log('deliveryDate', moment(deliveryDate.value[0], 'YYYY/MM/DD'));
|
|
|
- // console.log('priceDate', priceDate);
|
|
|
- // console.log('values', formState);
|
|
|
-
|
|
|
// 交收期
|
|
|
const dDate = deliveryDate.value;
|
|
|
if (dDate.length) {
|
|
|
@@ -500,12 +473,10 @@ export default defineComponent({
|
|
|
console.log('values', formState);
|
|
|
|
|
|
sendReq(param, OperateType)
|
|
|
- .then(res =>{
|
|
|
- cancel()
|
|
|
- })
|
|
|
- .catch(err =>{
|
|
|
-
|
|
|
+ .then((res) => {
|
|
|
+ cancel();
|
|
|
})
|
|
|
+ .catch((err) => {});
|
|
|
})
|
|
|
.catch((error: ValidateErrorEntity<FormState>) => {
|
|
|
console.log('error', error);
|
|
|
@@ -515,6 +486,7 @@ export default defineComponent({
|
|
|
queryCustomList();
|
|
|
getDeliveryGoods();
|
|
|
goodsList.value = getGoodsList();
|
|
|
+ console.log('goodsList.value', goodsList.value);
|
|
|
});
|
|
|
return {
|
|
|
visible,
|