aike/emis-oms-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-12-20 09:17:00 +08:00
parent 77d78df021
commit e06b266848
5 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/oms/TransProduct/index.vue
View File

@ -17,8 +17,9 @@
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-select v-model="queryParams.status" filterable clearable placeholder="启用状态" > <el-select v-model="queryParams.status" filterable clearable placeholder="启用状态" >
<el-option key="0" label="停用" :value="0" />
<el-option key="1" label="启用" :value="1" /> <el-option key="1" label="启用" :value="1" />
<el-option key="0" label="停用" :value="0" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</SearchForm> </SearchForm>
@ -159,6 +160,7 @@ export default {
prodName: null, prodName: null,
prodNameEn: null, prodNameEn: null,
country:null, country:null,
status:1
}, },
queryParamsInner: { queryParamsInner: {
country:null, country:null,
@ -178,6 +180,7 @@ export default {
}, },
created() { created() {
this.queryParams.status=1;
this.getList(); this.getList();
}, },
methods: { methods: {

2
src/views/oms/emisCustomerAddress/senderAddress.vue
View File

@ -130,7 +130,7 @@
</template> </template>
<script> <script>
import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress } from "@/api/oms/emisCustomerAddress"; import { listEmisCustomerAddress, getEmisCustomerAddress, delEmisCustomerAddress, addEmisCustomerAddress, updateEmisCustomerAddress,setDefaultAddressById } from "@/api/oms/emisCustomerAddress";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import senderAddressForm from '@/views/oms/emisCustomerAddress/senderAddressForm'; import senderAddressForm from '@/views/oms/emisCustomerAddress/senderAddressForm';
import CountryPicker from '@/views/oms/EmisBaseTools/CountryPicker.vue'; import CountryPicker from '@/views/oms/EmisBaseTools/CountryPicker.vue';

10
src/views/oms/emisWaybill/OrderRecord.vue
View File

@ -493,7 +493,7 @@
<!-- <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> --> <!-- <el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="60"> <el-table-column prop="cargoQty" :label="$t('件数')" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
</template> </template>
@ -534,7 +534,7 @@
<el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="this.transType==1" prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true"> <el-table-column prop="supplier" label="供应商" align="center" width="150" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.supplier" size="mini" placeholder=""></el-input> <el-input v-model="scope.row.supplier" size="mini" placeholder=""></el-input>
</template> </template>
@ -1344,6 +1344,12 @@ methods: {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
if(this.form.blAgree!=1){
this.$modal.msgError("《快递运单契约条款》未勾选");
return;
}
this.$refs["form"].validate((valid,obj) => { this.$refs["form"].validate((valid,obj) => {
if (valid) { if (valid) {
this.realSaveOrderInfo(); this.realSaveOrderInfo();

13
src/views/oms/emisWaybill/SendOrderbillList.vue
View File

@ -177,7 +177,7 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<!-- <el-form-item label="取件方式" prop="pickupMethod"> <el-form-item label="取件方式" prop="pickupMethod">
<el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择"> <el-select v-model="queryParams.pickupMethod" clearable placeholder="请选择">
<el-option <el-option
v-for="dict in dict.type.emis_qujian_fangshi" v-for="dict in dict.type.emis_qujian_fangshi"
@ -186,7 +186,7 @@
:value="dict.value" :value="dict.value"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item>
</SearchForm> </SearchForm>
<!-- border --> <!-- border -->
@ -387,12 +387,13 @@
<el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('操作员')" align="center" prop="operateEmployeeName" min-width="100" > <el-table-column :label="$t('专属业务员')" align="center" prop="operateEmployeeName" min-width="100" >
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span> <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
<span v-else></span> <span v-else-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
<span v-else>/</span>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/> <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> --> <!-- <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/> -->
@ -406,7 +407,7 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
<!-- <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" /> --> <!-- <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="salesmen" min-width="100" />
<!-- <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" > <!-- <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
<template slot-scope="scope"> <template slot-scope="scope">

4
src/views/oms/emisWaybill/panel/traceInfoPanel.vue
View File

@ -28,8 +28,8 @@
</div> </div>
<div v-if="extBillInfo!=null&&extBillInfo.blBillPicDispatchRmk==1" style="line-height:30px;margin-top: 5px; font-size: 14px;display: inline-flex;width:100%" class="panel" > <div v-if="extBillInfo!=null&&extBillInfo.blBillPicDispatchRmk==1" style="line-height:30px;margin-top: 5px; font-size: 14px;display: inline-flex;width:100%" class="panel" >
<div style="width: 85%;color:gray;padding-left: 10px;">签收底单</div> <div style="width: 15%;color:gray;padding-left: 10px;" @click="viewSignedPic">签收底单</div>
<div style="width: 15%;text-align: center;font-size: 14px;" @click="viewSignedPic">查看</div> <div style="width: 15%;text-align: left;font-size: 14px;" @click="viewSignedPic">查看</div>
</div> </div>
<!-- <el-scrollbar style="height:400px;"> --> <!-- <el-scrollbar style="height:400px;"> -->