chenjingyong
/
DSWMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

出库计划，打印时前端增加对选中明细的gid wmsoutplanid取值

Browse Source
temp
dengyu 1 year ago
parent e6ccb0dd46
commit 1aa5b607a0
5 changed files with 114 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
Vol.Vue/logo和公司文字切换/青岛金港物流/src/api/http.js
Unescape Escape View File

@ -15,7 +15,7 @@ if (process.env.NODE_ENV == 'development') {
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://127.0.0.1:8990/';
axios.defaults.ds7URL = 'http://118.190.210.123:8081/login.aspx';
axios.defaults.ds7URL = 'http://47.104.253.169:8088/login.aspx';
}
else if (process.env.NODE_ENV == 'production') {
axios.defaults.baseURL = 'http://47.104.253.169:9991/';

1
Vol.Vue/logo和公司文字切换/青岛金港物流/src/lang/zh.js
Unescape Escape View File

@ -334,6 +334,7 @@ module.exports = {
UNITPRICE: '不含税单价',
TAXRATE: '税率(%)',
NOTAXAMOUNT: '不含税金额',
NOTAXPRICE: '不含税单价',
TAX: '税额',
UNIT: '单位',
F_NO:'来源业务编号',

15
Vol.Vue/src/extension/wms/OP_WMS_OUT_PLAN.js
Unescape Escape View File

@ -282,6 +282,13 @@ let extension = {
// }
}
if (x.name == "提交审核") {
//金港物流 将 提交审核 改为 校验印鉴
if (this.http.FormShow.isJGWL) {
x.name = '校验印鉴';
}
}
//.$refs.WanHuaHuaXue_Btn.hidden = !this.http.FormShow.WanHuaHuaXue_Show;
//.$refs.WanHuaHuaXue_Btn.hidden = !this.http.FormShow.WanHuaHuaXue_Show;
}
@ -357,6 +364,7 @@ let extension = {
this.$refs.modelBody.$refs.tab_infofiles.$refs.tab_infofiles.reset();
this.$refs.modelBody.$refs.tab_nodr.reset();
this.$refs.modelBody.$refs.tab_wmsfee.reset();
this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.reset();
} else {
//编辑时，加载从表1，从表2的数据
this.$refs.modelBody.$refs.table1.load();
@ -366,6 +374,9 @@ let extension = {
this.$refs.modelBody.$refs.tab_infofiles.$refs.tab_infofiles.load();
this.$refs.modelBody.$refs.tab_nodr.load();
this.$refs.modelBody.$refs.tab_wmsfee.load();
if (this.http.FormShow.isJGWL) {
this.$refs.modelBody.$refs.tab_InfoClientContract.$refs.tab_InfoClientContract.load();
}
}
}
},
@ -433,7 +444,7 @@ let extension = {
this.$refs.modelBody.$refs.tab_truck.load();
this.$refs.modelBody.$refs.tab_condition.load();
this.$refs.modelBody.$refs.tab_infofiles.$refs.tab_infofiles.load();
this.$refs.modelBody.$refs.tab_wmsfee.load();
formData.mainData.MBLNO = this._mblno;
return true;
@ -444,6 +455,7 @@ let extension = {
this.$refs.modelBody.$refs.tab_truck.load();
this.$refs.modelBody.$refs.tab_condition.load();
this.$refs.modelBody.$refs.tab_infofiles.$refs.tab_infofiles.load();
this.$refs.modelBody.$refs.tab_wmsfee.load();
return true;
},
getLanguage(formname) {
@ -585,6 +597,7 @@ let extension = {
this.$refs.modelBody.$refs.tab_truckinfo.$refs.tab_truckinfo.load();
this.$refs.modelBody.$refs.tab_condition.$refs.tab_condition.load();
this.$refs.modelBody.$refs.tab_infofiles.$refs.tab_infofiles.load();
this.$refs.modelBody.$refs.tab_wmsfee.load();
return true;
},

103
Vol.Vue/src/extension/wms/OP_WMS_OUT_PLANModelBody.vue
Unescape Escape View File

@ -257,6 +257,14 @@
@loadAfter="loadTableAfter_tab_nodr"
></vol-table>
</TabPane>
<TabPane :label="this.$t('labeltitle.CustomerContrat')" icon="ios-aperture" v-show="http.FormShow.isJGWL">
<InfoClientContract_Table
ref="tab_InfoClientContract"
@loadBefore="loadTableBefore_InfoClientContract"
@loadAfter="loadTableAfter_InfoClientContract"
></InfoClientContract_Table>
</TabPane>
<TabPane :label="this.$t('labeltitle.op_wms_fee')" icon="ios-aperture">
<div class="tabs1-header">
@ -288,8 +296,9 @@
import VolTable from "@/components/basic/VolTable.vue";
import Infofiles_Table from "@/components/basic/InfoFile_Table.vue";
import Ch_feeTable from "@/components/basic/Ch_feeTable.vue";
import InfoClientContract_Table from "@/components/basic/InfoClientContract_Table.vue";
export default {
components: { VolTable,Infofiles_Table,Ch_feeTable,
components: { VolTable,Infofiles_Table,Ch_feeTable,InfoClientContract_Table,
VolForm: ()=> import("@/components/basic/VolForm.vue")
},
data() {
@ -475,8 +484,8 @@ export default {
//,bind:{ key:'blankdic',data:[]}
//,edit:{ type:'select',keep:true}
, edit: { type: "text", keep: true }
,type: "text",width:90,align:'left',sort:true},
, type: "text",width:90,align:'left',sort:true},
{field:'CreateDate',title:this.$t('CreateDate'),type:'datetime',width:150,align:'left',hidden:false,sort:true}
],
searchField_planlist: {
CUSTOMERNAME: "",
@ -686,8 +695,10 @@ export default {
{field:'PID',title:'FEEID',type:'string',width:90,align:'left',hidden:true},
{field:'CUSTOMERNAME',title:this.$t('feetitle').CUSTOMERNAME,type:'string',width:150,require:true,align:'left',require:true,sort:true,bind:{ key:'CustName',data:[]},edit:{type:'select',keep:true}},
{field:'REMARK',title:this.$t('TRUCKNO'),type:'string',width:140,align:'left',edit:{type:'text',keep:true}},
{field:'FEETYPE',title:this.$t('feetitle.FEETYPE'),type:'string',width:90,require:true,align:'left',require:true,bind:{ key:'feetype',data:[]},edit:{type:'select',keep:true}},
{field:'FEENAME',title:this.$t('feetitle.FEENAME'),type:'string',width:140,require:true,align:'left',require:true,bind:{ key:'feename',data:[]},edit:{type:'select',keep:true}},
{field:'UNIT',title:this.$t('feetitle.UNIT'),type:'string',width:100,require:true,align:'left',require:true,bind:{ key:'storageunit_type',data:[]},edit:{type:'select',keep:true}},
{field:'PRICE',title:this.$t('feetitle.TAXUNITPRICE'),type:'decimal',width:90,align:'left'
,edit: { type: "decimal", keep: true }
,onChange: (row,value,tabledata) => {
@ -713,7 +724,14 @@ export default {
},
{field:'AMOUNT',title:this.$t('AMOUNT'),type:'decimal',width:90,require:true,align:'left',summary:true},
{field:'CURRENCY',title:this.$t('feetitle.CURRENCY'),type:'string',bind:{ key:'bibie',data:[]},width:90,align:'left',edit: { type: "select", keep: true }},
{field:'REMARK',title:this.$t('REMARK'),type:'string',width:160,align:'left',edit:{type:'text',keep:true}},
{field:'TAXRATE',title:this.$t('feetitle.TAXRATE'),type:'decimal',width:90,require:true,align:'left',summary:true
,edit: { type: "decimal", keep: true }
},
{field:'TAX',title:this.$t('feetitle.TAX'),type:'decimal',width:90,require:true,align:'left',summary:true},
{field:'NOTAXAMOUNT',title:this.$t('feetitle.NOTAXAMOUNT'),type:'decimal',width:90,require:true,align:'left',summary:true},
{field:'NOTAXPRICE',title:this.$t('feetitle.NOTAXPRICE'),type:'decimal',width:90,require:true,align:'left',summary:true},
{field:'CreateID',title:'CreateID',type:'guid',width:80,hidden:true,align:'left',hidden:true},
{field:'CreateDate',title:this.$t('CreateDate'),type:'datetime',width:150,align:'left',hidden:true,sort:true},
{field:'Creator',title:'Creator',type:'string',width:130,align:'left',hidden:true},
@ -846,6 +864,9 @@ export default {
param.wheres.push({ name:"WMSPLANID",value: WMSPLANID,displayType:"=" });
if(!(param.Sort)){
param.Sort="CreateDate";
}
},
@ -1517,6 +1538,20 @@ export default {
}
});
},
loadTableBefore_InfoClientContract(param) {
param.wheres=[];
//let headid =this.getheadid();
let _this=this.$store.getters.data().outplan_parent_head;
let customername= _this.geteditformfield().CUSTOMERNAME;
param.TableName="客户合同查询";
param.wheres.push({ Name:"customername",Value:customername,displayType:'='});
},
loadTableAfter_InfoClientContract(data, callBack) {
return true;
},
getforminfo() {
let headid =this.getheadid();
@ -1690,13 +1725,30 @@ export default {
//return this.$Message.error(this.PrintInfo.PRINTID);
let headid=this.getheadid();
let rows2 = this.$refs.table1.getSelected();
let printkeys2 = rows2.map(x => {
return "'" + x['WMSOUTDETAILID'] + "'";
});
var keystr2=""
if(printkeys2.length>0){
printkeys2.forEach(x => {
if (keystr2 != "") keystr2+=","
keystr2 += x;
});
}else{
//
keystr2="''";
}
let PrintInfo = {
PRINTTYPE: this.PrintMessage.PRINTTYPE,
MODNAME: this.formname_cn,
PRINTNAME: this.PrintMessage.printname,
TITLE: "",
headid:headid,
BILLGID:headid
BILLGID:headid,
param1:"" + keystr2
};
let $http = this.http;
let tigger = false;
@ -1817,7 +1869,46 @@ export default {
}
}
},
delwmsfee(){
let _headform=this.$store.getters.data().outplan_parent_head;
let rows = this.$refs.tab_wmsfee.getSelected();
if (rows.length == 0) {
return this.$Message.error(this.$t('MSG.PleaseSelectRow'));
}
let delKeys = rows.map(x => {
return x['FEEID'];
});
let editFormFields = _headform.geteditformfield();
let formData = {
mainData: _headform.geteditformfield(),
detailData: null,
delKeys: delKeys
};
let tigger = false;
// this.$Modal.confirm({
// title: this.$t('MSG.DeleteAlert'),
// content:
// '<p style="color: red;font-weight: bold;letter-spacing: 3px;">确认要删除选择的数据吗?</p>',
// onOk: () => {
if (tigger) return;
tigger = true;
let url = "api/OP_WMS_FEE/DelDetail";
this.http.post(url, formData, this.$t('MSG.DeleteingData')).then(x => {
if (!x.status) return _headform.$error(x.message);
tigger = false;
this.$refs.tab_wmsfee.delRow(rows);
_headform.refresh();
});
// } //, onCancel: () => {}
// });
},
}
};
</script>

1
Vol.Vue/src/lang/zh.js
Unescape Escape View File

@ -334,6 +334,7 @@ module.exports = {
UNITPRICE: '不含税单价',
TAXRATE: '税率(%)',
NOTAXAMOUNT: '不含税金额',
NOTAXPRICE: '不含税单价',
TAX: '税额',
UNIT: '单位',
F_NO:'来源业务编号',

Write Preview
Loading…
Cancel
Save