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

Merge pull request 'master-dev' (#62) from master-dev into develop

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/62
This commit is contained in:
wuteng 2025-08-19 16:30:31 +08:00
commit 01f7aaf4cf
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/emis/EmisBaseTools/EmisSiteSelectTreePicker2.vue
View File

@ -53,7 +53,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24" v-if="!readOnly">
<el-row> <el-row>
<el-col :span="3"> <el-col :span="3">
<el-button size="mini" type="primary" @click="append">自定义</el-button> <el-button size="mini" type="primary" @click="append">自定义</el-button>
@ -458,6 +458,9 @@ import { data } from "jquery";
}, },
// 双击节点 // 双击节点
handleDoubleClick(node,data){ handleDoubleClick(node,data){
if(this.readOnly){
return;
}
data.inputeFlag = true; data.inputeFlag = true;
}, },
// 拖拽 放下 // 拖拽 放下

2
src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
View File

@ -152,7 +152,7 @@
if(key==null && val==null){ if(key==null && val==null){
this.defaultItems=[...this.optionItems] this.defaultItems=[...this.optionItems]
}else{ }else{
this.onChange(); // this.onChange();
} }
}); });
}, },

10
src/views/emis/emisSettleBill/CustSettleBillQueryList.vue
View File

@ -771,12 +771,12 @@ export default {
return v['sendName']+'--'+v['receiveName']; return v['sendName']+'--'+v['receiveName'];
} }
if (j === 'custName') { if (j === 'custName') {
let paymentType=v['paymentType']; // let paymentType=v['paymentType'];
if(paymentType==2 || paymentType==4 || paymentType==5 ){ // if(paymentType==2 || paymentType==4 || paymentType==5 ){
return v['custName']; return v['custName'];
}else{ // }else{
return ""; // return "";
} // }
} }
if (j === 'sendMobile') { if (j === 'sendMobile') {

4
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -1882,10 +1882,10 @@ methods: {
} }
this.form.sendSiteCode=item.siteCode; this.form.sendSiteCode=item.siteCode;
this.form.sendSiteName=item.siteName; this.form.sendSiteName=item.siteName;
if(this.sendSiteSelectCount > 2){ // if(this.sendSiteSelectCount > 2){
this.form.startSiteCode = item.siteCode; this.form.startSiteCode = item.siteCode;
this.form.startSiteName = item.siteName; this.form.startSiteName = item.siteName;
} // }
this.initGetTotalAvailablePag(this.form.sendSiteCode); this.initGetTotalAvailablePag(this.form.sendSiteCode);
// this.calcBillFee(); // this.calcBillFee();
}, },