修改问题件问题
This commit is contained in:
parent
4c7b6ec0da
commit
e74c0ef644
@ -8,7 +8,7 @@
|
|||||||
<div slot="label">
|
<div slot="label">
|
||||||
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
|
<el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
|
||||||
<el-radio label="1">运单号</el-radio>
|
<el-radio label="1">运单号</el-radio>
|
||||||
<el-radio label="0">订单号</el-radio>
|
<!-- <el-radio label="0">订单号</el-radio> -->
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
<!-- <el-input
|
<!-- <el-input
|
||||||
@ -57,7 +57,6 @@
|
|||||||
:showSearch.sync="showSearch"
|
:showSearch.sync="showSearch"
|
||||||
:queryParams="queryParams"
|
:queryParams="queryParams"
|
||||||
:total="attachmentList.length"
|
:total="attachmentList.length"
|
||||||
@queryTable="getList"
|
|
||||||
@selection-change="handleSelectionChange"
|
@selection-change="handleSelectionChange"
|
||||||
v-if="tableHeight" :max-height="tableHeight + 'px'"
|
v-if="tableHeight" :max-height="tableHeight + 'px'"
|
||||||
>
|
>
|
||||||
@ -121,6 +120,7 @@ import { delEmisWaybillAttachment, listEmisWaybillAttachment } from "@/api/emis/
|
|||||||
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
|
import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
|
||||||
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
|
||||||
import { parseTime, dateToStr } from "@/utils/custom";
|
import { parseTime, dateToStr } from "@/utils/custom";
|
||||||
|
import { formatSearchStr,deepClone } from '@/utils/index'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "OrderEntryAndReceiptPictureManagement",
|
name: "OrderEntryAndReceiptPictureManagement",
|
||||||
@ -242,7 +242,30 @@ export default {
|
|||||||
getList() {
|
getList() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
console.log("---->this.queryParams,", this.queryParams);
|
console.log("---->this.queryParams,", this.queryParams);
|
||||||
let queryParams = Object.assign({},this.queryParams);
|
// let queryParams = Object.assign({},this.queryParams);
|
||||||
|
let queryParams=deepClone(this.queryParams);
|
||||||
|
// if(queryParams.billCode){
|
||||||
|
// if(this.queryParams.params.queryOrderType != "1"){
|
||||||
|
// queryParams.orderSn=formatSearchStr(queryParams.billCode);
|
||||||
|
// queryParams.billCode=null;
|
||||||
|
// }else{
|
||||||
|
// // 处理子单号
|
||||||
|
// let qBillCode=formatSearchStr(queryParams.billCode);
|
||||||
|
// let billArr = qBillCode.split(",");
|
||||||
|
// let newBillCodeStr="";
|
||||||
|
// billArr.forEach(item=>{
|
||||||
|
// if(item.startsWith("T")){
|
||||||
|
// let mainBillCode=item.substr(0,14);
|
||||||
|
// newBillCodeStr=newBillCodeStr+mainBillCode+",";
|
||||||
|
// }else{
|
||||||
|
// newBillCodeStr=newBillCodeStr+item+",";
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// queryParams.billCode=newBillCodeStr;
|
||||||
|
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
|
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
|
||||||
queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
|
queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
|
||||||
queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
|
queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
|
||||||
@ -256,7 +279,8 @@ export default {
|
|||||||
queryParams.orderSN=this.queryParams.billCode;
|
queryParams.orderSN=this.queryParams.billCode;
|
||||||
queryParams.billCode=null;
|
queryParams.billCode=null;
|
||||||
}
|
}
|
||||||
|
// queryParams.billCode=null
|
||||||
|
// queryParams.params.billCode="T7080300008583,T7080300008599"
|
||||||
listEmisWaybillAttachment(queryParams).then(response => {
|
listEmisWaybillAttachment(queryParams).then(response => {
|
||||||
this.attachmentList = [];
|
this.attachmentList = [];
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|||||||
@ -11,13 +11,6 @@
|
|||||||
<el-radio label="0">订单号</el-radio>
|
<el-radio label="0">订单号</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
<!-- <el-input
|
|
||||||
v-model="queryParams.billCode"
|
|
||||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
|
||||||
clearable
|
|
||||||
type="textarea"
|
|
||||||
rows="2"
|
|
||||||
/> -->
|
|
||||||
<XdTextareaInput
|
<XdTextareaInput
|
||||||
v-model="queryParams.billCode"
|
v-model="queryParams.billCode"
|
||||||
:placeholder="$t('多个流水号逗号或换行隔开')"
|
:placeholder="$t('多个流水号逗号或换行隔开')"
|
||||||
@ -29,12 +22,9 @@
|
|||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-form-item label="登记时间" prop="dateTimeRange" label-width="90px">
|
<el-form-item label="登记时间" prop="dateTimeRange" label-width="90px">
|
||||||
<elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item :label="$t('登记网点')" prop="registerSiteCode" label-width="90px">
|
<el-form-item :label="$t('登记网点')" prop="registerSiteCode" label-width="90px">
|
||||||
<EmisSiteSimplePicker v-model="queryParams.registerSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
|
<EmisSiteSimplePicker v-model="queryParams.registerSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
|
||||||
@ -75,29 +65,6 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="8">
|
|
||||||
<el-form-item :label="$t('录入网点')" prop="registerSiteCode" label-width="80px">
|
|
||||||
<EmisSiteSimplePicker v-model="queryParams.registerSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item :label="$t('签收图片')" prop="isSignPic" label-width="80px">
|
|
||||||
<el-select v-model="queryParams.isSignPic" :placeholder="$t('全部')" value="0">
|
|
||||||
<el-option :label="$t('未上传')" value="1"></el-option>
|
|
||||||
<el-option :label="$t('已上传')" value="2"></el-option>
|
|
||||||
</el-select>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item :label="$t('派件员')" prop="dispatchManCode" label-width="80px">
|
|
||||||
<EmisUserSimplePicker v-model="queryParams.dispatchManCode" postCode="RSD" @onChange="onStaffSelect" ></EmisUserSimplePicker>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item :label="$t('收件国家')" prop="receiveCountry" label-width="80px">
|
|
||||||
<CountryPicker v-model="queryParams.receiveCountry" @onChange="onCountrySelect" ></CountryPicker>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col> -->
|
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- </search-form> -->
|
<!-- </search-form> -->
|
||||||
@ -334,6 +301,13 @@ export default {
|
|||||||
this.tableHeight = window.innerHeight - tableH;
|
this.tableHeight = window.innerHeight - tableH;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
const end = new Date()
|
||||||
|
const start = new Date()
|
||||||
|
start.setHours(0,0,0,0)
|
||||||
|
end.setHours(23,59,59,0)
|
||||||
|
this.dateTimeRange=[start,end];
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询扫描记录列表 */
|
/** 查询扫描记录列表 */
|
||||||
getList() {
|
getList() {
|
||||||
@ -358,7 +332,7 @@ export default {
|
|||||||
}
|
}
|
||||||
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
||||||
// listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
// listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
||||||
listEmisWaybill(this.queryParams).then(response => {
|
listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
||||||
this.emisElectronicPagApplyList = [];
|
this.emisElectronicPagApplyList = [];
|
||||||
// this.total = 0;
|
// this.total = 0;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
|
<el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
|
||||||
<elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
@ -239,6 +239,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
|
||||||
import { listEmisWaybill } from "@/api/emis/emisWaybill";
|
import { listEmisWaybill } from "@/api/emis/emisWaybill";
|
||||||
import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
|
import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
|
||||||
|
|
||||||
@ -378,6 +379,13 @@ export default {
|
|||||||
this.tableHeight = window.innerHeight - tableH;
|
this.tableHeight = window.innerHeight - tableH;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
const end = new Date()
|
||||||
|
const start = new Date()
|
||||||
|
start.setHours(0,0,0,0)
|
||||||
|
end.setHours(23,59,59,0)
|
||||||
|
this.dateTimeRange=[start,end];
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询扫描记录列表 */
|
/** 查询扫描记录列表 */
|
||||||
getList() {
|
getList() {
|
||||||
@ -403,7 +411,8 @@ export default {
|
|||||||
}
|
}
|
||||||
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
||||||
// (this.queryParams).then(response => {
|
// (this.queryParams).then(response => {
|
||||||
listEmisWaybill(this.queryParams).then(response => {
|
// listEmisWaybill(this.queryParams).then(response => {
|
||||||
|
listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
||||||
this.emisElectronicPagApplyList = [];
|
this.emisElectronicPagApplyList = [];
|
||||||
// this.total = 0;
|
// this.total = 0;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|||||||
@ -29,7 +29,7 @@
|
|||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-col :span="16">
|
<el-col :span="16">
|
||||||
<el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
|
<el-form-item label="登记时间" prop="dateTimeRange" label-width="80px">
|
||||||
<elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
@ -195,6 +195,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
|
||||||
import { listEmisWaybill } from "@/api/emis/emisWaybill";
|
import { listEmisWaybill } from "@/api/emis/emisWaybill";
|
||||||
import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
|
import { addEmisWaybillProblemFaq } from "@/api/emis/emisWaybillProblemFaq";
|
||||||
|
|
||||||
@ -334,6 +335,13 @@ export default {
|
|||||||
this.tableHeight = window.innerHeight - tableH;
|
this.tableHeight = window.innerHeight - tableH;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
const end = new Date()
|
||||||
|
const start = new Date()
|
||||||
|
start.setHours(0,0,0,0)
|
||||||
|
end.setHours(23,59,59,0)
|
||||||
|
this.dateTimeRange=[start,end];
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
/** 查询扫描记录列表 */
|
/** 查询扫描记录列表 */
|
||||||
getList() {
|
getList() {
|
||||||
@ -358,8 +366,8 @@ export default {
|
|||||||
this.queryParams.billCode="";
|
this.queryParams.billCode="";
|
||||||
}
|
}
|
||||||
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
// listEmisTmsScanRecord(this.queryParams).then(response => {
|
||||||
// listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
listEmisWaybillProblemInfo(this.queryParams).then(response => {
|
||||||
listEmisWaybill(this.queryParams).then(response => {
|
// listEmisWaybill(this.queryParams).then(response => {
|
||||||
this.emisElectronicPagApplyList = [];
|
this.emisElectronicPagApplyList = [];
|
||||||
// this.total = 0;
|
// this.total = 0;
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user