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 2025-01-05 09:24:21 +08:00
parent 5e6db49aa4
commit c7b43b0487
6 changed files with 57 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/PdfViewer/A4Viewer.vue
View File

@ -364,7 +364,6 @@ export default {
needGenList.push(thisSubList[j].pdfBase64)
}
}
this.pdfUtils.mergePdfToA4(needGenList,fileName,true);
}).catch(() => {});

26
src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue
View File

@ -54,15 +54,17 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('图片上传')" prop="confirmStatus">
<el-select clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
</el-select>
<el-form-item :label="$t('图片上传')" prop="blUploadPic">
<el-select clearable v-model="queryParams.blUploadPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item label="寄件人" prop="sendName">
<el-input
v-model="queryParams.params.sendName"
@ -87,6 +89,10 @@
<el-form-item :label="$t('销售联系人')" prop="salesmen">
<SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
</el-form-item>
<el-form-item label="进仓仓库" prop="intoWarehouseCode">
<EmisSiteSimplePicker1 v-model="queryParams.params.intoWarehouseCode" ></EmisSiteSimplePicker1>
</el-form-item>
</el-col>
</el-row>
@ -210,9 +216,9 @@
<el-table-column :label="$t('总件数')" align="center" prop="totalParcelQty" min-width="100" />
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
<el-table-column :label="$t('图片上传')" align="center" prop="up" min-width="100" >
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.billPicGoodsRmk&&scope.row.waybillDetail.billPicGoodsRmk!=''" type="success">是</el-tag>
<el-tag v-if="scope.row.blUploadPic==1" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
@ -263,11 +269,12 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
// import emisWarehouseInView from '@/views/emis/emisWarehouseIn/emisWarehouseInView';
import emisWarehouseInForm from '@/views/emis/emisWarehouseIn/emisWarehouseInForm';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
export default {
name: "emisWarehouseIn",
components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,SalemanPicker },
components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,SalemanPicker,EmisSiteSimplePicker1 },
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','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
@ -335,7 +342,8 @@ export default {
sendName:null,
sendMobile:null,
sendCompany:null,
blUploadGoodsPic:null
blUploadGoodsPic:null,
intoWarehouseCode:null
}
},
};

11
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -277,12 +277,12 @@
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item :label="$t('图片上传')" prop="confirmStatus">
<el-form-item :label="$t('图片上传')" prop="blUploadGoodsPic">
<el-select clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
</el-select>
</el-form-item>
</el-form-item>
<!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
<el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
<el-option :key="1" label="'1'" value="'1'">是</el-option>
@ -553,7 +553,12 @@
<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" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.goodsPics!=''" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
</XdTable>

12
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -285,12 +285,12 @@
/>
</el-form-item> -->
<el-form-item :label="$t('图片上传')" prop="confirmStatus">
<el-form-item :label="$t('图片上传')" prop="blUploadGoodsPic">
<el-select clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
</el-select>
</el-form-item>
</el-form-item>
@ -553,8 +553,14 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" 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" />
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.goodsPics!=''" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
</XdTable>

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

@ -254,7 +254,7 @@
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item :label="$t('图片上传')" prop="confirmStatus">
<el-form-item :label="$t('图片上传')" prop="blUploadGoodsPic">
<el-select clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
@ -520,7 +520,12 @@
<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" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.goodsPics!=''" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
</XdTable>
<el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false" v-dialogDrag append-to-body>
@ -1072,6 +1077,14 @@ export default {
return '自提';
}
}
if (j === 'blUploadPic') {
if(v['goodsPics']!=''){
return '是';
}else{
return '否';
}
}
if (j === 'blMessage') {
if(v[j] == 1){
return '发送';

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

@ -260,12 +260,12 @@
<el-form-item :label="$t('录单员')" prop="registerManCode">
<EmisUserSimplePicker1 :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
</el-form-item>
<el-form-item :label="$t('图片上传')" prop="confirmStatus">
<el-form-item :label="$t('图片上传')" prop="blUploadGoodsPic">
<el-select clearable v-model="queryParams.params.blUploadGoodsPic" placeholder="">
<el-option key="1" label="已上传" value="1"></el-option>
<el-option key="0" label="未上传" value="0"></el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
</SearchForm>
@ -525,7 +525,12 @@
<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" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
<template slot-scope="scope">
<el-tag v-if="scope.row.goodsPics!=''" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
</XdTable>