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-05-22 20:00:11 +08:00
parent c0ab71fbaa
commit f387b9cde6
7 changed files with 37 additions and 1521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@
this.svalue = newVal;
},
svalue(newVal, oldVal) {
this.$emit("input", this.svalue);
// this.$emit("input", this.svalue);
},
parentCode(newVal) {
this.queryData();

9
src/views/emis/EmisBaseTools/ProvincePicker.vue
View File

@ -47,25 +47,24 @@
},
methods: {
onChange() {
console.log("xxxxx00000:"+this.svalue)
this.$emit("input", this.svalue);
this.$emit("onChange",this.svalue);
},
queryData() {
this.optionItems =[];
if(!this.countryCode && !this.svalue){
return;
}
let queryParams = {
pageNum:1,
pageSize:100,
pageSize:50,
countryCode:this.countryCode,
regionCode:this.svalue,
regionType:1
};
console.log(queryParams);
listSimpleEmisRegion(queryParams).then(response => {
this.optionItems = response.rows;
console.log(response);
});
},

2
src/views/emis/emisCustomerUser/moneyUserForm.vue
View File

@ -419,7 +419,7 @@ export default {
customerNameEn: null,
phone: null,
mobile: null,
customerType: this.customerType,
customerType: '1',
settledType: '1',
userType: null,
company: null,

21
src/views/emis/emisCustomerUser/monthUserForm.vue
View File

@ -7,8 +7,8 @@
<el-input v-model="form.customerCode" placeholder="自动生成" disabled />
</el-form-item>
</el-col> -->
<el-col :span="16">
<el-form-item label="客户名称" prop="company">
<el-col :span="10">
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="" />
</el-form-item>
</el-col>
@ -18,6 +18,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
</el-col>
<el-col :span="8">
<el-form-item label="联系人" prop="customerName">
<el-input v-model="form.contact" placeholder="" />
@ -76,7 +79,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="首次签约日期" prop="firstSigningDay">
<el-input v-model="form.firstSigningDay" placeholder="" />
<el-date-picker
style="width: 100%;"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
v-model="form.firstSigningDay"
type="date"
placeholder="首次签约日期"
></el-date-picker>
</el-form-item>
</el-col>
@ -357,7 +367,7 @@ export default {
simpleName: null,
phone: null,
mobile: null,
customerType: null,
customerType: '2',
settledType: '2',
userType: null,
company: null,
@ -415,13 +425,14 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
this.form.company=this.form.customerName;
updateEmisCustomerUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$emit("on-changed");
});
} else {
addEmisCustomerUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.$modal.msgSuccess("新增成功");
this.$emit("on-changed");
});
}

2
src/views/emis/emisCustomerUser/monthUserList.vue
View File

@ -117,7 +117,7 @@
</el-table-column> -->
<el-table-column :label="$t('客户名称')" align="left" prop="company" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.company}}</div>
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.customerName}}</div>
</template>
</el-table-column>

1492
src/views/emis/emisWaybill/emisWaybillModify copy.vue
View File

File diff suppressed because it is too large Load Diff

30
src/views/emis/emisWaybill/waybillList.vue
View File

@ -260,20 +260,17 @@
<el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="发货信息" align="center" > -->
<!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
<template slot-scope="scope">
<router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
<span>{{ scope.row.billCode }}</span>
</router-link>
</template>
</el-table-column> -->
<el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('销售回款人')" align="center" prop="payee" min-width="100" />
<el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
<el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" />
<el-table-column :label="$t('收件业务员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
@ -287,10 +284,8 @@
</el-table-column>
<!-- </el-table-column> -->
<!-- <el-table-column label="寄件信息" align="center" > -->
<el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
@ -405,7 +400,8 @@
<el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
<!-- </el-table-column> -->
<el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
</XdTable>
@ -432,7 +428,9 @@ import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
export default {
name: "WaybillIsPrinted",
components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
dicts: ['emis_waybill_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
'emis_calc_fee_type','emis_print_type'
],
data() {
return {