12/25 界面优化1.0

dev_unify
wangwei 3 months ago
parent 28556944db
commit 2f3d9d6684

@ -798,9 +798,9 @@
>查询
</el-button
>
<el-button type="primary" @click="handleExportView"
<el-button type="primary" @click="handleExport"
icon="el-icon-download"
>导出
>导出阳光采购平台追溯码上传数据
</el-button>
</el-button-group>
</el-form-item>
@ -1247,7 +1247,7 @@ export default {
ycBillNo:null,
detailNo:null
}
this.handleExportViewVisible = false
// this.handleExportViewVisible = false
},
handleExport(){
if (isBlank(this.currentRow.billNo)) {
@ -1255,14 +1255,14 @@ export default {
return;
}
this.editQuery.billNo = this.currentRow.billNo
if (isBlank(this.editQuery.ycBillNo)) {
this.$message.error("请先输入需要导出的订单编号!")
return;
}
if (isBlank(this.editQuery.detailNo)) {
this.$message.error("请先输入需要导出的交易明细编号!")
return;
}
// if (isBlank(this.editQuery.ycBillNo)) {
// this.$message.error("")
// return;
// }
// if (isBlank(this.editQuery.detailNo)) {
// this.$message.error("")
// return;
// }
excelExport(this.editQuery).then(res => {
let blob = new Blob([res], {type: "application/vnd.ms-excel"});
@ -1734,12 +1734,12 @@ export default {
this.getResultDetailList();
},
handleExportView() {
if (isBlank(this.currentRow.billNo)) {
this.$message.error("请先选择需要导出的单据!")
return;
}
this.handleExportViewVisible = true;
this.exportTitle = "单据 "+this.currentRow.billNo + " 追溯码导出"
// if (isBlank(this.currentRow.billNo)) {
// this.$message.error("")
// return;
// }
// this.handleExportViewVisible = true;
// this.exportTitle = " "+this.currentRow.billNo + " "
},
getResultDetailList() {
if (isBlank(this.currentRow.billNo)) {

@ -151,105 +151,48 @@
</el-table-column>
</el-table>
<!-- <template>-->
<!-- <p class="form-title2">流通时采用的计量单位设置</p>-->
<!-- </template>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">-->
<!-- <el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"-->
<!-- @change="distributeLevelDiChange"-->
<!-- placeholder="请选择计量单位"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packUnit"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="允许采集的最大层级:" prop="distributeMaxLevel" label-width="160px">-->
<!-- <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"-->
<!-- placeholder="请选择允许采集的最大层级"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packLevel"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-divider></el-divider>-->
<!-- <template>-->
<!-- <p class="form-title2">使用时采用的计量单位设置</p>-->
<!-- </template>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="计量单位:" prop="useLevel" label-width="160px">-->
<!-- <el-select v-model="newProductData.useLevel" size="small" style="width: 90%"-->
<!-- clearable-->
<!-- @change="useLevelDiChange"-->
<!-- placeholder="请选择计量单位"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packUnit"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="允许采集的最大层级:" prop="useMaxLevel" label-width="160px">-->
<!-- <el-select v-model="newProductData.useMaxLevel" size="small" style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="请选择允许采集的最大层级"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packLevel"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="11" class="el-col">-->
<!-- <el-form-item label="拆包后可用时长(小时):" prop="unpackUseTime" label-width="160px">-->
<!-- <el-input v-model="newProductData.unpackUseTime" size="small" style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="请输入拆包后可用时长(小时)"-->
<!-- >-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<template>
<p class="form-title2">流通时采用的计量单位设置</p>
</template>
<el-row :gutter="20">
<el-col :span="11" class="el-col">
<el-form-item label="计量单位:" prop="distributeLevel" label-width="160px">
<el-select v-model="newProductData.distributeLevel" size="small" style="width: 90%"
@change="distributeLevelDiChange"
placeholder="请选择计量单位"
>
<el-option
v-for="item in levelUnitList"
:key="item.packLevel"
:value="item.packLevel"
:label="item.packUnit"
>
<span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>
<span style="float: left">层级:{{ item.packLevel }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="11" class="el-col">-->
<!-- <el-form-item label="允许采集的最大层级:" label-width="160px">-->
<!-- <el-select v-model="newProductData.distributeMaxLevel" size="small" style="width: 90%"-->
<!-- placeholder="请选择允许采集的最大层级"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in levelUnitList"-->
<!-- :key="item.packLevel"-->
<!-- :value="item.packLevel"-->
<!-- :label="item.packLevel"-->
<!-- >-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">单位:{{ item.packUnit }}</span>-->
<!-- <span style="float: left">层级:{{ item.packLevel }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!--</el-col>-->
</el-row>
</el-collapse-item>
<el-collapse-item name="2">
<template slot="title">

Loading…
Cancel
Save