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

Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

Browse Source
This commit is contained in:
liuyp 2024-05-30 16:24:16 +08:00
commit a2b76d32d2
2 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,9 +504,6 @@ import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
import PdfViewer from '@/components/PdfViewer/index.vue';
import PdfUtils from '@/utils/pdfUtils'
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
@ -514,7 +511,6 @@ export default {
name: "WaybillIsPrinted",
components: {
TanexPrinterPanel,
PdfViewer,
elDateAdvPicker,
emisWaybillForm,
CountryPicker1,

50
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -160,35 +160,21 @@
</el-col>
<el-col :span="18" v-if="action=='add'">
<el-form-item label="打印选项:" prop="printTypeCheckList">
<el-checkbox-group v-model="form.printTypeCheckList">
<!-- <el-checkbox
v-for="dict in dict.type.emis_print_type"
:key="dict.value"
:label="dict.label"
>
<span >{{dict.label}}</span>
</el-checkbox> -->
<el-checkbox :key="1" :label="1" >
<span >寄件网点存根联</span>
</el-checkbox>
<el-checkbox :key="5" :label="5" >
<span >子单</span>
</el-checkbox>
</el-checkbox-group>
<el-form-item label="打印选项:" prop="printTypeCheckList" style="display:inline-flex">
<div>
<el-checkbox-group v-model="form.printTypeCheckList">
<el-checkbox :key="1" :label="1" >
<span >寄件网点存根联</span>
</el-checkbox>
<el-checkbox :key="5" :label="5" >
<span >子单</span>
</el-checkbox>
</el-checkbox-group>
</div>
<div>
<TanexPrinterPanel ref="tanexPrinter" ></TanexPrinterPanel>
</div>
</el-form-item>
<!-- <div style="display:flex;padding-left: 30px;">
<el-checkbox-group v-model="printTypeCheckList">
<el-checkbox
v-for="dict in dict.type.emis_print_type"
:key="dict.value"
:label="dict.label"
>
<span style="font-size:13px" >{{dict.label}}</span>
</el-checkbox>
</el-checkbox-group>
</div> -->
</el-col>
<!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
@ -790,8 +776,7 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
import feeItemForm from './feeItemForm.vue';
import PdfViewer from '@/components/PdfViewer/index.vue';
import PdfUtils from '@/utils/pdfUtils'
import TanexPrinterPanel from '@/views/emis/EmisBaseTools/TanexPrinterPanel.vue';
export default {
@ -805,7 +790,7 @@ export default {
components: {
SalemanPicker,
PayeePicker,
PdfViewer,
TanexPrinterPanel,
feeItemForm,
TransProductCasPicker,
WarehouseInNoPicker,
@ -1025,10 +1010,8 @@ computed: {
},
created() {
// this.billCode=this.$route.query.billCode+"";
this.action=this.$route.query.action;
this.initData();
},
methods: {
handleScanInput(){
@ -1063,7 +1046,6 @@ methods: {
});
},
handleApplyPag(){
this.$router.push("/d24/electronicFormManagement/ApplyList");
},