接口问题修改

jg-waiwang-pro
vayne 3 months ago
parent 5b0a57b1cf
commit de91952026

@ -231,7 +231,8 @@
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 12 THEN '销售发货单出库' END warehousingStorageType,
e.name warehouseName
e.name warehouseName,
a.yunguan_mark as yunguanMark
from jg_warehousing_outbound a
LEFT JOIN flow_task b on a.id = b.f_process_id
LEFT JOIN jg_warehousing_notification c ON a.warehousing_id = c.id
@ -259,7 +260,8 @@
(SELECT SUM(outbound_number) from jg_warehousing_outbound_product WHERE warehousing_outbound_id = a.id) outboundNumber,
a.f_creator_time storageTime,
case a.warehousing_outbound_type WHEN 1 THEN '销售出库' WHEN 12 THEN '销售发货单出库' END warehousingStorageType,
e.name warehouseName
e.name warehouseName,
a.yunguan_mark as yunguanMark
from jg_warehousing_outbound a
LEFT JOIN flow_task b on a.id = b.f_process_id
LEFT JOIN jg_delivery_order c ON a.warehousing_id = c.id

@ -24,6 +24,7 @@ import jnpf.model.warehousingoutbound.*;
import jnpf.util.wxutil.HttpUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
@ -114,7 +115,8 @@ public class WarehousingOutboundController {
private WarehousingNotificationService warehousingNotificationService;
@Autowired
private ReturnCargoOrderService returnCargoOrderService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/**
*
*
@ -687,16 +689,20 @@ public class WarehousingOutboundController {
//inventoryLogEntity.setRetailPrice();//零售价
inventoryLogService.saveOrUpdate(inventoryLogEntity);
}
// if (entity.getWarehousingOutboundType().equals("1")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){
// if (saleCode.get("code").equals("200")) {
// }
// }
// }
// }
if (entity.getWarehousingOutboundType().equals("1")){
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(entity.getId());
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
if (ObjectUtil.isNotEmpty(saleCode)){
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
warehousingOutboundService.saveOrUpdate(entity);
}
}
}
}catch(Exception e){
return ActionResult.fail("修改数据失败");

@ -19,6 +19,7 @@ import jnpf.model.warehousingstorage.*;
import jnpf.util.wxutil.HttpUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
@ -103,7 +104,8 @@ public class WarehousingStorageController {
private BusinessOrderService businessOrderService;
@Autowired
private ReturnCargoOrderService returnCargoOrderService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/**
*
*
@ -686,16 +688,20 @@ public class WarehousingStorageController {
//inventoryLogEntity.setRetailPrice();//零售价
inventoryLogService.saveOrUpdate(inventoryLogEntity);
}
// if (entity.getWarehousingStorageType().equals("1")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
// if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) {
// }
// }
// }
// }
if (entity.getWarehousingStorageType().equals("1")){
List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
entity.setErpMark(purchaseCode.get("code").toString());
entity.setErpMassage(purchaseCode.get("errmsg").toString());
}else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
warehousingStorageService.saveOrUpdate(entity);
}
}
}
}
}catch(Exception e){

@ -262,7 +262,6 @@ export default {
columnOptions: columnOptions.join(","),
paramList
};
debugger
getDataInterfaceDataSelect(this.interfaceId, query)
.then(res => {
this.list = res.data.list;

@ -0,0 +1,412 @@
<template>
<div class="popupSelect-container">
<div class="el-select" @click="openDialog">
<el-input :placeholder="placeholder" v-model="innerValue" readonly :validate-event="false"
@mouseenter.native="inputHovering = true" @mouseleave.native="inputHovering = false"
:disabled="disabled">
<template slot="suffix">
<i v-show="!showClose"
:class="['el-select__caret', 'el-input__icon', 'el-icon-arrow-up']"></i>
<i v-if="showClose" class="el-select__caret el-input__icon el-icon-circle-close"
@click="clear"></i>
</template>
</el-input>
</div>
<template v-if="popupType === 'dialog'">
<el-dialog :title="popupTitle" :close-on-click-modal="false" :visible.sync="visible"
v-if="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body
:width="popupWidth">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="10">
<el-form-item label="关键词">
<el-input v-model="listQuery.keyword" placeholder="请输入关键词查询" clearable
@keyup.enter.native="search()" class="search-input" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">
{{ $t("common.search") }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">{{ $t("common.reset") }}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" :border="false" highlight-current-row
@row-click="rowClick" :hasNO="false" @row-dblclick="dbRowClick">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row[propsValue]" v-model="checked">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column :prop="item.value" :label="item.label" v-for="(item, i) in columnOptions"
:key="i" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" v-if="hasPage" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false" size="small">{{
$t("common.cancelButton")
}}</el-button>
<el-button type="primary" @click="select()" size="small">{{ $t("common.confirmButton") }}
</el-button>
</span>
</el-dialog>
</template>
<template v-if="popupType === 'drawer'">
<el-drawer :title="popupTitle" :visible.sync="visible" :wrapperClosable="false" ref="drawer"
:size="popupWidth" append-to-body class="JNPF-common-drawer">
<div class="JNPF-flex-main">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="10">
<el-form-item label="关键词">
<el-input v-model="listQuery.keyword" placeholder="请输入关键词查询" clearable
@keyup.enter.native="search()" class="search-input" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">
{{ $t("common.search") }}
</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">{{ $t("common.reset") }}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" :border="false" highlight-current-row
@row-click="rowClick" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row[propsValue]" v-model="checked">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column :prop="item.value" :label="item.label"
v-for="(item, i) in columnOptions" :key="i" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" v-if="hasPage" />
<div class="drawer-footer">
<el-button @click="visible = false" size="small">{{ $t("common.cancelButton") }}
</el-button>
<el-button type="primary" @click="select()"
size="small">{{ $t("common.confirmButton") }}
</el-button>
</div>
</div>
</el-drawer>
</template>
</div>
</template>
<script>
import {
getDataInterfaceDataSelect,
getDataInterfaceDataInfoByIds
} from "@/api/systemData/dataInterface";
import emitter from "element-ui/src/mixins/emitter";
let {
methods: { dispatch }
} = emitter;
export default {
name: "JnpfPopupSelectInnerValueCancel",
props: {
value: {
default: ""
},
rowIndex: {
default: null
},
formData: {
type: Object
},
templateJson: {
type: Array,
default: () => []
},
interfaceId: {
type: String,
default: ""
},
innerName: {
type: String,
default: ""
},
placeholder: {
type: String,
default: "请选择"
},
propsValue: {
type: String,
default: "id"
},
relationField: {
type: String,
default: "fullName"
},
popupType: {
type: String,
default: "dialog"
},
popupTitle: {
type: String,
default: "选择数据"
},
popupWidth: {
type: String,
default: "800px"
},
field: {
type: String,
default: ""
},
columnOptions: {
type: Array,
default: () => []
},
hasPage: {
type: Boolean,
default: false
},
pageSize: {
type: Number,
default: 20
},
multiple: {
type: Boolean,
default: false
},
disabled: {
type: Boolean,
default: false
},
clearable: {
type: Boolean,
default: true
}
},
model: {
prop: "value",
event: "input"
},
data() {
return {
list: [],
innerValue: "",
listQuery: {
keyword: "",
currentPage: 1,
pageSize: 20
},
total: 0,
checked: "",
checkedTxt: "",
checkedRow: {},
listLoading: false,
visible: false,
inputHovering: false
};
},
watch: {
value(val) {
this.setDefault();
}
},
computed: {
showClose() {
let hasValue = this.multiple
? Array.isArray(this.value) && this.value.length > 0
: this.value !== undefined && this.value !== null && this.value !== "";
let criteria =
this.clearable && !this.disabled && this.inputHovering && hasValue;
return criteria;
},
propsLabel() {
return this.columnOptions[0].value;
}
},
created() {
this.listQuery.pageSize = this.hasPage ? this.pageSize : 100000;
this.setDefault();
},
methods: {
initData() {
if (!this.interfaceId) return;
this.listLoading = true;
const paramList = this.getParamList();
const columnOptions = this.columnOptions.map(o => o.value);
let query = {
...this.listQuery,
interfaceId: this.interfaceId,
propsValue: this.propsValue,
relationField: this.relationField,
columnOptions: columnOptions.join(","),
paramList
};
getDataInterfaceDataSelect(this.interfaceId, query)
.then(res => {
this.list = res.data.list;
this.total = res.data.pagination.total;
this.listLoading = false;
})
.catch(() => {
this.listLoading = false;
});
},
getParamList() {
let templateJson = this.templateJson;
if (!this.formData) return templateJson;
for (let i = 0; i < templateJson.length; i++) {
if (templateJson[i].relationField) {
if (templateJson[i].relationField.includes("-")) {
let tableVModel = templateJson[i].relationField.split("-")[0];
let childVModel = templateJson[i].relationField.split("-")[1];
templateJson[i].defaultValue =
(this.formData[tableVModel] &&
this.formData[tableVModel][this.rowIndex] &&
this.formData[tableVModel][this.rowIndex][childVModel]) ||
"";
} else {
templateJson[i].defaultValue =
this.formData[templateJson[i].relationField] || "";
}
}
}
return templateJson;
},
interfaceDataHandler(data) {
if (!data.dataProcessing) return data.list;
const dataHandler = this.jnpf.getScriptFunc.call(
this,
data.dataProcessing
);
if (!dataHandler) return data.list;
return dataHandler(data.list);
},
search() {
this.initData();
this.listQuery.currentPage = 1;
this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000;
},
reset() {
this.listQuery.keyword = "";
this.listQuery.currentPage = 1;
this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000;
this.initData();
},
openDialog() {
if (this.disabled) return;
this.checked = this.value;
this.visible = true;
this.reset();
},
clear(event) {
this.checked = "";
this.innerValue = "";
this.checkedRow = {};
this.$emit("input", this.checked);
this.$emit("change", this.checked, this.checkedRow, this.rowIndex);
dispatch.call(this, "ElFormItem", "el.form.change", this.checked);
event.stopPropagation();
},
select() {
debugger
if (!this.checked) return;
if (this.checkedRow.yunguanMark != 'Y') {
this.innerValue = '';
} else {
this.innerValue = this.checkedTxt;
}
this.$emit("input", this.checked);
this.$emit("change", this.checked, this.checkedRow, this.rowIndex);
dispatch.call(this, "ElFormItem", "el.form.change", this.checked);
this.visible = false;
},
rowClick(row) {
if (this.checked == row[this.propsValue]) {
this.select();
} else {
this.checked = row[this.propsValue];
this.checkedTxt = row[this.relationField];
this.checkedRow = row;
}
},
dbRowClick(row) {
this.checked = row[this.propsValue];
this.checkedTxt = row[this.relationField];
this.checkedRow = row;
this.select();
},
setDefault() {
if (this.value) {
if (!this.interfaceId) return;
const paramList = this.getParamList();
let query = {
ids: [this.value],
interfaceId: this.interfaceId,
propsValue: this.propsValue,
relationField: this.relationField,
paramList
};
let that = this;
getDataInterfaceDataInfoByIds(this.interfaceId, query).then(res => {
const data = res.data && res.data.length ? res.data[0] : {};
this.innerValue = data[this.relationField];
if (!this.innerValue) {
this.innerValue = this.innerName;
}
if (!this.field) return;
let relationData = this.$store.state.generator.relationData;
this.$set(relationData, this.field, data);
this.$eventBus.$emit("popupAttrEventBus", relationData, this.field);
this.$store.commit("generator/UPDATE_RELATION_DATA", relationData);
});
} else {
this.innerValue = "";
if (!this.field) return;
let relationData = this.$store.state.generator.relationData;
this.$set(relationData, this.field, {});
this.$eventBus.$emit("popupAttrEventBus", relationData, this.field);
this.$store.commit("generator/UPDATE_RELATION_DATA", relationData);
}
}
}
};
</script>
<style lang="scss" scoped>
>>> .el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -66,6 +66,7 @@ import JnpfDateRangePicker from '@/components/Generator/components/JnpfDateRange
import JnpfPopupSelectCus from '@/components/CusJnpf/PopupSelect'
import CusPopupSelect from '@/components/Cus/PopupSelect'
import JnpfPopupSelectInnerName from '@/components/Jnpf/PopupSelectInnerName'
import JnpfPopupSelectInnerValueCancel from '@/components/Jnpf/PopupSelectInnerValueCancel'
import JnpfPopupSelectPaymentInterbankNumberView from '@/components/Jnpf/PopupSelectPaymentInterbankNumberView'
import JnpfPopupSelectPaymentFundingPlanView from '@/components/Jnpf/PopupSelectPaymentFundingPlanView'
@ -138,6 +139,7 @@ export default {
Vue.component('JnpfPopupSelectCus', JnpfPopupSelectCus)
Vue.component('CusPopupSelect', CusPopupSelect)
Vue.component('JnpfPopupSelectInnerName', JnpfPopupSelectInnerName)
Vue.component('JnpfPopupSelectInnerValueCancel', JnpfPopupSelectInnerValueCancel)
Vue.component('JnpfPopupSelectPaymentInterbankNumberView', JnpfPopupSelectPaymentInterbankNumberView)
Vue.component('JnpfPopupSelectPaymentFundingPlanView', JnpfPopupSelectPaymentFundingPlanView)

@ -45,6 +45,8 @@
</el-table-column>
<el-table-column prop="voucherNum" label="凭证数" align="center" width="200">
</el-table-column>
<el-table-column prop="yunguanMark" label="运管标记" align="center" width="150">
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="init" />

@ -1915,9 +1915,9 @@ export default {
}
if (mark) {
this.$message({
message: '存在运管暂未返回正常订单状态的订单',
message: '运管没有返回审批标记,请确认!',
type: 'error',
duration: 1000
duration: 2000
});
return
}

@ -206,7 +206,8 @@
<!-- <template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
@click="shoufukuanHandle(scope.row)">收付款</el-button> -->
<template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -512,7 +513,7 @@ export default {
},
methods: {
repush(val) {
debugger
val.reloading = true
let orderType = ''
if (val.type == '1') {
orderType = '6'
@ -531,11 +532,15 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -771,6 +776,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

@ -267,7 +267,8 @@
</el-button>
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -476,8 +477,9 @@ export default {
},
methods: {
repush(val) {
val.reloading = true
let param = {
id: val,
id: val.id,
type: '1'
}
request({
@ -488,11 +490,15 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
downLoadPDF(code) {
window.open(
@ -529,10 +535,10 @@ export default {
inBoundNotice(row) {
if (row.yunguanMark != 'Y') {
this.$message({
message: '运管没有返回审批标记,请确认!',
type: 'error',
message: '运管暂未返回正常订单状态',
duration: 1500,
})
duration: 2000
});
return
}
const selectData = row
@ -849,6 +855,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

@ -50,13 +50,14 @@
</el-col>
<el-col :span="8" v-if="judgeShow('businessId')">
<jnpf-form-tip-item label="采购订单" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId" @change="getPurchaseOrder"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField="code"
field="businessId" interfaceId="530042614796255877" :pageSize="20" :hasPage="true"
<JnpfPopupSelectInnerValueCancel v-model="dataForm.businessId"
@change="getPurchaseOrder" :rowIndex="null" :formData="dataForm"
:templateJson="interfaceRes.businessId" placeholder="请选择"
:disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField="code" field="businessId"
interfaceId="530042614796255877" :pageSize="20" :hasPage="true"
:columnOptions="businessIdcolumnOptions" clearable :style="{ width: '100%' }">
</JnpfPopupSelect>
</JnpfPopupSelectInnerValueCancel>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reservedFields1')">
@ -1419,7 +1420,7 @@ export default {
transportModeProps: { label: "fullName", value: "id" },
receiptTypeOptions: [{ fullName: "采购收货", id: "1" }],
receiptTypeProps: { label: "fullName", value: "id" },
businessIdcolumnOptions: [{ label: "订单编号", value: "code" }, { label: "供应商名称", value: "subjectName" }, { label: "单据类型", value: "orderType1" }, { label: "采购数量", value: "planPurchaseNum" }, { label: "关联合同", value: "contractName" }, { label: "状态", value: "purchaseStatus" },],
businessIdcolumnOptions: [{ label: "订单编号", value: "code" }, { label: "供应商名称", value: "subjectName" }, { label: "单据类型", value: "orderType1" }, { label: "采购数量", value: "planPurchaseNum" }, { label: "关联合同", value: "contractName" }, { label: "状态", value: "purchaseStatus" }, { label: "运管标记", value: "yunguanMark" }],
reservedFields1columnOptions: [
{ label: "业务线编码", value: "code" },
{ label: "业务线名称", value: "name" }
@ -1792,9 +1793,9 @@ export default {
if (val2.yunguanMark != 'Y') {
this.dataForm.businessId = undefined
this.$message({
message: '运管暂未返回正常订单状态',
message: '运管没有返回审批标记,请确认!',
type: 'error',
duration: 1000
duration: 2000
});
return
}

@ -50,14 +50,14 @@
</el-col>
<el-col :span="8" v-if="judgeShow('businessId')">
<jnpf-form-tip-item label="关联销售" v-if="judgeShow('businessId')" prop="businessId">
<JnpfPopupSelect v-model="dataForm.businessId" @change="getSaleOrder" :rowIndex="null"
:formData="dataForm" :templateJson="interfaceRes.businessId" placeholder="请选择"
:disabled="judgeWrite('businessId')" propsValue="id" popupWidth="800px"
popupTitle="选择数据" popupType="dialog" relationField="code" field="businessId"
interfaceId="529638640356183877" :pageSize="20" :hasPage="true"
<JnpfPopupSelectInnerValueCancel v-model="dataForm.businessId" @change="getSaleOrder"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.businessId"
placeholder="请选择" :disabled="judgeWrite('businessId')" propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField="code"
field="businessId" interfaceId="529638640356183877" :pageSize="20" :hasPage="true"
:innerName="dataForm.businessOrderCode" :columnOptions="businessIdcolumnOptions"
clearable :style="{ width: '100%' }">
</JnpfPopupSelect>
</JnpfPopupSelectInnerValueCancel>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" v-if="judgeShow('reservedFields1')">
@ -1278,7 +1278,8 @@ export default {
{ label: "销售金额", value: "taxCount" },
{ label: "单据类型", value: "orderType1" },
{ label: "配送方式", value: "deliveryType1" },
{ label: "状态", value: "saleStatus" }
{ label: "状态", value: "saleStatus" },
{ label: "运管标记", value: "yunguanMark" }
],
reservedFields1columnOptions: [
{ label: "业务线编码", value: "code" },
@ -1735,9 +1736,9 @@ export default {
if (val2.yunguanMark != 'Y') {
this.dataForm.businessId = undefined
this.$message({
message: '运管暂未返回正常订单状态',
message: '运管没有返回审批标记,请确认!',
type: 'error',
duration: 1000
duration: 2000
});
return
}

@ -230,7 +230,8 @@
</el-button>
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -293,7 +294,6 @@ export default {
},
data() {
return {
deliveryType: '',
keyword: '',
expandsTree: true,
@ -435,8 +435,9 @@ export default {
},
methods: {
repush(val) {
val.reloading = true
let param = {
id: val,
id: val.id,
type: '2'
}
request({
@ -447,19 +448,23 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
outBoundNotice(row) {
if (row.yunguanMark != 'Y') {
this.$message({
message: '运管没有返回审批标记,请确认!',
type: 'error',
message: '运管暂未返回正常订单状态',
duration: 1500,
})
duration: 2000
});
return
}
const selectData = row
@ -732,6 +737,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

@ -152,7 +152,8 @@
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -296,8 +297,9 @@ export default {
},
methods: {
repush(val) {
val.reloading = true
let param = {
id: val,
id: val.id,
type: '4'
}
request({
@ -308,11 +310,15 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -503,6 +509,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

@ -158,7 +158,8 @@
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -361,8 +362,9 @@ export default {
},
methods: {
repush(val) {
val.reloading = true
let param = {
id: val,
id: val.id,
type: '3'
}
request({
@ -373,11 +375,15 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -574,6 +580,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

@ -168,7 +168,8 @@
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
<el-button size="mini" type="text" :loading="scope.row.reloading"
@click="repush(scope.row)">重新推送</el-button>
</template>
</template>
</el-table-column>
@ -315,8 +316,9 @@ export default {
},
methods: {
repush(val) {
val.reloading = true
let param = {
id: val,
id: val.id,
type: '5'
}
request({
@ -327,11 +329,15 @@ export default {
this.$message({
type: 'success',
message: res.msg,
duration: 2000,
onClose: () => {
this.initData()
}
});
})
val.reloading = false
}).catch(() => {
val.reloading = false
});
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -526,6 +532,9 @@ export default {
...o,
...this.expandObj,
}))
this.list.forEach(e => {
this.$set(e, 'reloading', false)
})
this.total = res.data.pagination.total
this.listLoading = false
})

Loading…
Cancel
Save