aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-07 16:30:10 +08:00
parent f23a02aa13
commit 2fcff8b824
3 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/XdTable/index.vue
View File

@ -322,10 +322,10 @@ export default {
}
var fileRowNodes = oDiv.getElementsByTagName("tr");
refTableObj.clearSelection()
// refTableObj.clearSelection()
for (var i = 0; i < fileRowNodes.length; i++) {
if (fileRowNodes[i].className.indexOf("el-table__row") != -1) {
fileRowNodes[i].classList.remove("rowSeled");
// fileRowNodes[i].classList.remove("rowSeled");
selRowList.push(fileRowNodes[i]);
}
}
@ -336,7 +336,7 @@ export default {
var _x = null;
var _y = null;
// vnode.context.clearEventBubble(evt);
vnode.context.clearEventBubble(evt);
// //打开开关
vnode.context.mouseflag = true;
// //鼠标拖动时画框
@ -417,7 +417,7 @@ export default {
} else {
if (selRowList[i].className.indexOf("rowSeled") != -1 ) {
// selRowList[i].className = "el-table__row";
// refTableObj.toggleRowSelection(vnode.context.tableData[i],false);
refTableObj.toggleRowSelection(vnode.context.tableData[i],false);
// vnode.context.multipleSelection.forEach((ele,i)=>{
// //这里没用对象是否相等用的是传入table中的唯一的myKey字段
// if(ele[vnode.context.myKey]==vnode.context.tableData[i][vnode.context.myKey] ){
@ -428,7 +428,7 @@ export default {
}
}
}
// vnode.context.clearEventBubble(evt);
vnode.context.clearEventBubble(evt);
};
function showContextMenu(event){

5
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -246,7 +246,7 @@
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" @onChange="onSalemanChange" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
@ -840,6 +840,9 @@ export default {
},
calcDeliveryTime(startData,endDate){
return timeDiffTime(startData,endDate)
},
onSalemanChange(){
this.queryParams.sendSiteCode=null;
},
//标红table指定行
tableRowClassName({row, rowIndex}) {

68
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -43,9 +43,9 @@
<el-col :span="5">
<el-form-item label="寄件网点" prop="productType">
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" ></EmisSiteSimplePicker1>
<EmisSiteSimplePicker1 v-model="queryParams.sendSiteCode" :disabled="($store.getters.ownerSiteCode !='88888') && (queryParams.salesmen==null||queryParams.salesmen=='')" ></EmisSiteSimplePicker1>
</el-form-item>
<!-- :disabled="$store.getters.ownerSiteCode!='88888'" -->
<el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
<EmisSiteSimplePicker2 v-model="queryParams.dispatchUnderlingSiteCode" ></EmisSiteSimplePicker2>
@ -250,7 +250,7 @@
<PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee" ></PayeePicker>
</el-form-item>
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" ></SalemanPicker>
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen" @onChange="onSalemanChange" ></SalemanPicker>
</el-form-item>
<el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
@ -560,10 +560,6 @@
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<TraceWaybillDetailView :key="resetRefreshId" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
</el-dialog>
<!--
<el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true" :close-on-click-modal="false" v-dialogDrag append-to-body>
<WaybillDetailReadOnly :billCode="currentTraceBillCode"></WaybillDetailReadOnly>
</el-dialog> -->
</XdPageContainer>
@ -853,9 +849,9 @@ export default {
};
},
created() {
// if(this.$store.getters.ownerSiteCode!='88888'){
// this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
// }
if(this.$store.getters.ownerSiteCode!='88888'){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
@ -881,7 +877,10 @@ export default {
calcDeliveryTime(startData,endDate){
return timeDiffTime(startData,endDate)
},
//标红table指定行
onSalemanChange(){
this.queryParams.sendSiteCode=null;
},
//标红table指定行
tableRowClassName({row, rowIndex}) {
if (row.blSign=='1') {
@ -907,39 +906,30 @@ export default {
initQueryParams(){
// this.queryOrderType="1";
// this.queryOrderDateType="1";
if(this.queryParams.billCode){
if(this.queryOrderType != "1"){
this.queryParams.orderSn=formatSearchStr(this.queryParams.billCode);
this.queryParams.billCode=null;
}else{
// 处理子单号
let qBillCode=formatSearchStr(this.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+",";
}
});
this.queryParams.billCode=newBillCodeStr;
}
}
this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"sendDate");
let qParam=null;
if(this.queryParams.billCode){
qParam={
pageNum:this.queryParams.pageNum,
pageSize:this.queryParams.pageSize,
billCode:this.queryParams.billCode,
}
}else{
if(this.$store.getters.ownerSiteCode!='88888'&&(this.queryParams.salesmen==null||this.queryParams.salesmen=='') ){
this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
}
qParam=this.queryParams
}
return qParam;
},
/** 查询运单列表列表 */
getList() {
this.loading = true;
this.initQueryParams();
listEmisWaybill(this.queryParams).then(response => {
let qParam=this.initQueryParams();
listEmisWaybill(qParam).then(response => {
this.emisWaybillList = response.rows;
this.total = response.total;
this.loading = false;