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-06-22 14:24:35 +08:00
parent 14c1d2e13b
commit 8e7467330f
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/emis/emisPrintTpl/designerPanel.vue
View File

@ -1,19 +1,18 @@
<!-- <template> <template>
<div > <div >
<KrPrintDesigner ref="printDesigner" :temp-value="form.tplData" :widget-options="widgets" @save="handleSave" ></KrPrintDesigner>
</div> </div>
</template> -->
<template>
<kr-print-designer ref="printDesigner" :temp-value="value" :widget-options="widgets" @save="handleSave" />
</template> </template>
<!-- <template>
<kr-print-designer ref="printDesigner" :temp-value="value" :widget-options="widgets" @save="handleSave" />
</template> -->
<script> <script>
import { listEmisPrintTpl, getEmisPrintTpl, delEmisPrintTpl, addEmisPrintTpl, updateEmisPrintTpl } from "@/api/emis/emisPrintTpl"; import { listEmisPrintTpl, getEmisPrintTpl, delEmisPrintTpl, addEmisPrintTpl, updateEmisPrintTpl } from "@/api/emis/emisPrintTpl";
import KrPrintDesigner from "@/components/PrintDesigner/index.vue"; // import KrPrintDesigner from "@/components/PrintDesigner/index.vue";
// import "kr-print-designer/lib/kr-print-designer.css"; // import "kr-print-designer/lib/kr-print-designer.css";
// KrPrintDesigner
import { OutStockOptions, InStockOptions } from './data/options' import { OutStockOptions, InStockOptions } from './data/options'
export default { export default {
@ -22,7 +21,7 @@ export default {
type:[Number,Array] type:[Number,Array]
} }
}, },
components: { KrPrintDesigner }, components: { },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -138,7 +137,7 @@ export default {
}, },
// 手动初始话模板数据 // 手动初始话模板数据
initTemp(){ initTemp(){
this.$refs.printDesigner.initTemp(this.value,this.widgets) // this.$refs.printDesigner.initTemp(this.value,this.widgets)
} }
}, },
} }

25
src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
View File

@ -30,13 +30,13 @@
</el-form-item> </el-form-item>
<!-- </el-col> --> <!-- </el-col> -->
<!-- <el-col :span="8"> --> <!-- <el-col :span="8"> -->
<el-form-item :label="$t('录入网点')" prop="recordSiteCode" label-width="70px"> <el-form-item :label="$t('签收网点')" prop="signSiteCode" label-width="70px">
<EmisSiteSimplePicker v-model="queryParams.recordSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker> <EmisSiteSimplePicker v-model="queryParams.signSiteCode" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
<!-- </el-col> --> <!-- </el-col> -->
<!-- <el-col :span="8"> --> <!-- <el-col :span="8"> -->
<el-form-item :label="$t('签收图片')" prop="isUploadPic"> <el-form-item :label="$t('签收图片')" prop="isUploadPic">
<el-select v-model="queryParams.params.isUploadPic" :placeholder="$t('全部')" value="0"> <el-select v-model="queryParams.params.isUploadPic" clearable :placeholder="$t('全部')" value="0">
<el-option :label="$t('未上传')" value="0"></el-option> <el-option :label="$t('未上传')" value="0"></el-option>
<el-option :label="$t('已上传')" value="1"></el-option> <el-option :label="$t('已上传')" value="1"></el-option>
</el-select> </el-select>
@ -124,21 +124,26 @@
<span>{{ scope.row.waybillDetail.timeType }}</span> <span>{{ scope.row.waybillDetail.timeType }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="150"> <!-- <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.waybillDetail.registerManName }}</span> <span>{{ scope.row.waybillDetail.registerManName }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100"> <!-- <el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.waybillDetail.registerSiteName }}</span> <span>{{ scope.row.waybillDetail.registerSiteName }}</span>
</template> </template>
</el-table-column> -->
<el-table-column :label="$t('寄件网点')" align="center" prop="recordSiteCode" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.sendSiteName }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('录入时间')" align="center" prop="waybillDetail.registerDate" min-width="170" > <!-- <el-table-column :label="$t('录入时间')" align="center" prop="waybillDetail.registerDate" min-width="170" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span> <span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> --> <!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" /> <el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150"> <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="150">
@ -353,8 +358,8 @@ export default {
// this.form.countryCode=item.code; // this.form.countryCode=item.code;
}, },
onScanSiteSelect(item){ onScanSiteSelect(item){
this.queryParams.scanSite=item && item.siteName; // this.queryParams.scanSite=item && item.siteName;
this.queryParams.scanSiteCode=item && item.siteCode; // this.queryParams.scanSiteCode=item && item.siteCode;
}, },
onPreOrNextSiteSelect(item){ onPreOrNextSiteSelect(item){
this.queryParams.preOrNextStation=item && item.siteName; this.queryParams.preOrNextStation=item && item.siteName;