|
|
|
@ -122,10 +122,10 @@
|
|
|
|
|
<el-divider style="margin: 15px"></el-divider>
|
|
|
|
|
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
|
|
|
|
|
border :default-sort="defaultSort"
|
|
|
|
|
:row-style="{ height: '32px' }"
|
|
|
|
|
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
|
|
|
|
|
@sort-change="handleSortChange"
|
|
|
|
|
>
|
|
|
|
|
:row-style="{ height: '32px' }">
|
|
|
|
|
<!-- @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"-->
|
|
|
|
|
<!-- @sort-change="handleSortChange"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
|
|
|
|
|
<el-table-column label="操作" width="100" fixed="right" v-if="splitType!='search'">
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
@ -280,415 +280,415 @@
|
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-tabs type="border-card" style="margin: 15px">
|
|
|
|
|
<el-tab-pane>
|
|
|
|
|
<span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>
|
|
|
|
|
<el-form :inline="true" :model="bizQuery" class="query-form" size="mini">
|
|
|
|
|
<el-row style=" display:flex; flex-wrap: wrap; ">
|
|
|
|
|
<template v-for="(item, index) in queryList2">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`" :key="item.id">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="bizQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
|
|
|
|
|
clearable
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select v-model="bizQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in item.lableRuleObj"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="bizQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
@change="executeFuc($event,'5',item.checkRules)"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
filterable
|
|
|
|
|
remote
|
|
|
|
|
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in options[item.clickFuc]"
|
|
|
|
|
:key="item.code"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:value="item.code"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
|
v-model="actDateRange"
|
|
|
|
|
type="daterange"
|
|
|
|
|
format="yyyy 年 MM 月 dd 日"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
range-separator="至"
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="bizQuery[item.columnName]"
|
|
|
|
|
:style="`width:${item.width+'px'}`"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
type="date"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</template>
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button-group>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
icon="el-icon-refresh"
|
|
|
|
|
@click="onBizReset"
|
|
|
|
|
>重置
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="primary" @click="onBizSubmit"
|
|
|
|
|
icon="el-icon-search"
|
|
|
|
|
>查询
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-row>
|
|
|
|
|
<!-- <el-tabs type="border-card" style="margin: 15px" v-if="false">-->
|
|
|
|
|
<!-- <el-tab-pane>-->
|
|
|
|
|
<!-- <span slot="label">单据 {{ currentRow.billNo }}-单据详情</span>-->
|
|
|
|
|
<!-- <el-form :inline="true" :model="bizQuery" class="query-form" size="mini">-->
|
|
|
|
|
<!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
|
|
|
|
|
<!-- <template v-for="(item, index) in queryList2">-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`" :key="item.id">-->
|
|
|
|
|
<!-- <el-input-->
|
|
|
|
|
<!-- v-model="bizQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-select v-model="bizQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- clearable>-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="dict in item.lableRuleObj"-->
|
|
|
|
|
<!-- :key="dict.value"-->
|
|
|
|
|
<!-- :label="dict.label"-->
|
|
|
|
|
<!-- :value="dict.value"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-select-->
|
|
|
|
|
<!-- v-model="bizQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- @change="executeFuc($event,'5',item.checkRules)"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- filterable-->
|
|
|
|
|
<!-- remote-->
|
|
|
|
|
<!-- :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"-->
|
|
|
|
|
<!-- clearable>-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in options[item.clickFuc]"-->
|
|
|
|
|
<!-- :key="item.code"-->
|
|
|
|
|
<!-- :label="item.label"-->
|
|
|
|
|
<!-- :value="item.code"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-date-picker-->
|
|
|
|
|
<!-- :picker-options="pickerOptions"-->
|
|
|
|
|
<!-- v-model="actDateRange"-->
|
|
|
|
|
<!-- type="daterange"-->
|
|
|
|
|
<!-- format="yyyy 年 MM 月 dd 日"-->
|
|
|
|
|
<!-- value-format="yyyy-MM-dd"-->
|
|
|
|
|
<!-- range-separator="至"-->
|
|
|
|
|
<!-- start-placeholder="开始日期"-->
|
|
|
|
|
<!-- end-placeholder="结束日期"-->
|
|
|
|
|
<!-- ></el-date-picker>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-date-picker-->
|
|
|
|
|
<!-- v-model="bizQuery[item.columnName]"-->
|
|
|
|
|
<!-- :style="`width:${item.width+'px'}`"-->
|
|
|
|
|
<!-- value-format="yyyy-MM-dd"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- type="date"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- ></el-date-picker>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- <el-form-item>-->
|
|
|
|
|
<!-- <el-button-group>-->
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
<!-- type="primary"-->
|
|
|
|
|
<!-- icon="el-icon-refresh"-->
|
|
|
|
|
<!-- @click="onBizReset"-->
|
|
|
|
|
<!-- >重置-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- <el-button type="primary" @click="onBizSubmit"-->
|
|
|
|
|
<!-- icon="el-icon-search"-->
|
|
|
|
|
<!-- >查询-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- </el-button-group>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
<!-- </el-form>-->
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
|
|
|
|
|
row-key="id" :row-style="{height:'32px'}"
|
|
|
|
|
>
|
|
|
|
|
<template v-for="(item, index) in tableHeader2">
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
|
|
|
|
|
type="index" :label="item.columnDesc"></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'selection'"
|
|
|
|
|
type="selection"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<!-- <el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border-->
|
|
|
|
|
<!-- row-key="id" :row-style="{height:'32px'}"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template v-for="(item, index) in tableHeader2">-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- type="index" :label="item.columnDesc"></el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'selection'"-->
|
|
|
|
|
<!-- type="selection"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
|
|
|
|
|
<!-- ></el-table-column>-->
|
|
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
|
|
|
|
|
item.lableRuleObj[scope.row[item.columnName]]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-tag
|
|
|
|
|
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
|
|
|
|
|
<span>{{
|
|
|
|
|
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
fixed="right"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
|
|
|
|
|
:type="buttonItem.type"
|
|
|
|
|
:size="buttonItem.size"
|
|
|
|
|
:style="buttonItem.style"
|
|
|
|
|
:key="buttonItem"
|
|
|
|
|
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
|
|
|
|
|
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
|
|
|
|
|
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
|
|
|
|
|
>{{ buttonItem.name }}
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
|
|
|
|
|
scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table>
|
|
|
|
|
<!-- <pagination-->
|
|
|
|
|
<!-- v-show="bizTotal>0"-->
|
|
|
|
|
<!-- :total="bizTotal"-->
|
|
|
|
|
<!-- :page.sync="bizQuery.page"-->
|
|
|
|
|
<!-- :limit.sync="bizQuery.limit"-->
|
|
|
|
|
<!-- @pagination="getBizDetailList"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{-->
|
|
|
|
|
<!-- item.lableRuleObj[scope.row[item.columnName]]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-tag-->
|
|
|
|
|
<!-- :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
|
|
|
|
|
<!-- <span>{{-->
|
|
|
|
|
<!-- item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </el-tag>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- fixed="right"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
|
|
|
|
|
<!-- :type="buttonItem.type"-->
|
|
|
|
|
<!-- :size="buttonItem.size"-->
|
|
|
|
|
<!-- :style="buttonItem.style"-->
|
|
|
|
|
<!-- :key="buttonItem"-->
|
|
|
|
|
<!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
|
|
|
|
|
<!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
|
|
|
|
|
<!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
|
|
|
|
|
<!-- >{{ buttonItem.name }}-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
|
|
|
|
|
<!-- scope.row[item.columnName]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table>-->
|
|
|
|
|
<!-- <!– <pagination–>-->
|
|
|
|
|
<!-- <!– v-show="bizTotal>0"–>-->
|
|
|
|
|
<!-- <!– :total="bizTotal"–>-->
|
|
|
|
|
<!-- <!– :page.sync="bizQuery.page"–>-->
|
|
|
|
|
<!-- <!– :limit.sync="bizQuery.limit"–>-->
|
|
|
|
|
<!-- <!– @pagination="getBizDetailList"–>-->
|
|
|
|
|
<!-- <!– />–>-->
|
|
|
|
|
<!-- </el-tab-pane>-->
|
|
|
|
|
|
|
|
|
|
<!--单据扫码明细-->
|
|
|
|
|
<el-tab-pane>
|
|
|
|
|
<span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>
|
|
|
|
|
<el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form"
|
|
|
|
|
size="mini">
|
|
|
|
|
<!-- <el-form-item class="query-form-item" label="UDI码:">-->
|
|
|
|
|
<!-- <el-input-->
|
|
|
|
|
<!-- v-model="resultQuery.code"-->
|
|
|
|
|
<!-- placeholder="请输入UDI码"-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- </el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<el-row style=" display:flex; flex-wrap: wrap; ">
|
|
|
|
|
<template v-for="(item, index) in queryList4">
|
|
|
|
|
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`" :key="item.id">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="resultQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
|
|
|
|
|
clearable
|
|
|
|
|
></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select v-model="resultQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="dict in item.lableRuleObj"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="resultQuery[item.columnName]"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
@change="executeFuc($event,'5',item.checkRules)"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
filterable
|
|
|
|
|
remote
|
|
|
|
|
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
|
|
|
|
|
clearable>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in options[item.clickFuc]"
|
|
|
|
|
:key="item.code"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:value="item.code"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
:picker-options="pickerOptions"
|
|
|
|
|
v-model="actDateRange"
|
|
|
|
|
type="daterange"
|
|
|
|
|
format="yyyy 年 MM 月 dd 日"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
range-separator="至"
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
|
|
|
|
|
:label="item.columnDesc+`:`">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="resultQuery[item.columnName]"
|
|
|
|
|
:style="`width:${item.width+'px'}`"
|
|
|
|
|
value-format="yyyy-MM-dd"
|
|
|
|
|
:disabled="executeEval(null,item.disabledFuc,false)"
|
|
|
|
|
type="date"
|
|
|
|
|
:placeholder="item.columnDesc"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</template>
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-button-group>
|
|
|
|
|
<el-button
|
|
|
|
|
type="primary"
|
|
|
|
|
icon="el-icon-refresh"
|
|
|
|
|
@click="onResultReset"
|
|
|
|
|
>重置
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button type="primary" @click="onResultSubmit"
|
|
|
|
|
icon="el-icon-search"
|
|
|
|
|
>查询
|
|
|
|
|
</el-button
|
|
|
|
|
>
|
|
|
|
|
</el-button-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-row>
|
|
|
|
|
<!-- <!–单据扫码明细–>-->
|
|
|
|
|
<!-- <el-tab-pane>-->
|
|
|
|
|
<!-- <span slot="label">单据 {{ currentRow.billNo }}-扫码明细</span>-->
|
|
|
|
|
<!-- <el-form v-if="queryList4 && queryList4.length > 0" :inline="true" :model="resultQuery" class="query-form"-->
|
|
|
|
|
<!-- size="mini">-->
|
|
|
|
|
<!-- <!– <el-form-item class="query-form-item" label="UDI码:">–>-->
|
|
|
|
|
<!-- <!– <el-input–>-->
|
|
|
|
|
<!-- <!– v-model="resultQuery.code"–>-->
|
|
|
|
|
<!-- <!– placeholder="请输入UDI码"–>-->
|
|
|
|
|
<!-- <!– clearable–>-->
|
|
|
|
|
<!-- <!– >–>-->
|
|
|
|
|
<!-- <!– </el-input>–>-->
|
|
|
|
|
<!-- <!– </el-form-item>–>-->
|
|
|
|
|
<!-- <el-row style=" display:flex; flex-wrap: wrap; ">-->
|
|
|
|
|
<!-- <template v-for="(item, index) in queryList4">-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`" :key="item.id">-->
|
|
|
|
|
<!-- <el-input-->
|
|
|
|
|
<!-- v-model="resultQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"-->
|
|
|
|
|
<!-- clearable-->
|
|
|
|
|
<!-- ></el-input>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-select v-model="resultQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- clearable>-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="dict in item.lableRuleObj"-->
|
|
|
|
|
<!-- :key="dict.value"-->
|
|
|
|
|
<!-- :label="dict.label"-->
|
|
|
|
|
<!-- :value="dict.value"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-select-->
|
|
|
|
|
<!-- v-model="resultQuery[item.columnName]"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- @change="executeFuc($event,'5',item.checkRules)"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- filterable-->
|
|
|
|
|
<!-- remote-->
|
|
|
|
|
<!-- :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"-->
|
|
|
|
|
<!-- clearable>-->
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
<!-- v-for="item in options[item.clickFuc]"-->
|
|
|
|
|
<!-- :key="item.code"-->
|
|
|
|
|
<!-- :label="item.label"-->
|
|
|
|
|
<!-- :value="item.code"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-date-picker-->
|
|
|
|
|
<!-- :picker-options="pickerOptions"-->
|
|
|
|
|
<!-- v-model="actDateRange"-->
|
|
|
|
|
<!-- type="daterange"-->
|
|
|
|
|
<!-- format="yyyy 年 MM 月 dd 日"-->
|
|
|
|
|
<!-- value-format="yyyy-MM-dd"-->
|
|
|
|
|
<!-- range-separator="至"-->
|
|
|
|
|
<!-- start-placeholder="开始日期"-->
|
|
|
|
|
<!-- end-placeholder="结束日期"-->
|
|
|
|
|
<!-- ></el-date-picker>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :label="item.columnDesc+`:`">-->
|
|
|
|
|
<!-- <el-date-picker-->
|
|
|
|
|
<!-- v-model="resultQuery[item.columnName]"-->
|
|
|
|
|
<!-- :style="`width:${item.width+'px'}`"-->
|
|
|
|
|
<!-- value-format="yyyy-MM-dd"-->
|
|
|
|
|
<!-- :disabled="executeEval(null,item.disabledFuc,false)"-->
|
|
|
|
|
<!-- type="date"-->
|
|
|
|
|
<!-- :placeholder="item.columnDesc"-->
|
|
|
|
|
<!-- ></el-date-picker>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- <el-form-item>-->
|
|
|
|
|
<!-- <el-button-group>-->
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
<!-- type="primary"-->
|
|
|
|
|
<!-- icon="el-icon-refresh"-->
|
|
|
|
|
<!-- @click="onResultReset"-->
|
|
|
|
|
<!-- >重置-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- <el-button type="primary" @click="onResultSubmit"-->
|
|
|
|
|
<!-- icon="el-icon-search"-->
|
|
|
|
|
<!-- >查询-->
|
|
|
|
|
<!-- </el-button-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- </el-button-group>-->
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
<!-- </el-row>-->
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
<!-- </el-form>-->
|
|
|
|
|
|
|
|
|
|
<el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
|
|
|
|
|
row-key="id" :row-style="{height:'32px'}"
|
|
|
|
|
>
|
|
|
|
|
<template v-for="(item, index) in tableHeader4">
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
|
|
|
|
|
type="index" :label="item.columnDesc"></el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'selection'"
|
|
|
|
|
type="selection"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
|
|
|
|
|
></el-table-column>
|
|
|
|
|
<!-- <el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border-->
|
|
|
|
|
<!-- row-key="id" :row-style="{height:'32px'}"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template v-for="(item, index) in tableHeader4">-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- type="index" :label="item.columnDesc"></el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'selection'"-->
|
|
|
|
|
<!-- type="selection"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
|
|
|
|
|
<!-- ></el-table-column>-->
|
|
|
|
|
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
|
|
|
|
|
item.lableRuleObj[scope.row[item.columnName]]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-tag
|
|
|
|
|
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
|
|
|
|
|
<span>{{
|
|
|
|
|
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
fixed="right"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
|
|
|
|
|
:type="buttonItem.type"
|
|
|
|
|
:size="buttonItem.size"
|
|
|
|
|
:style="buttonItem.style"
|
|
|
|
|
:key="buttonItem"
|
|
|
|
|
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
|
|
|
|
|
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
|
|
|
|
|
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
|
|
|
|
|
>{{ buttonItem.name }}
|
|
|
|
|
</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column
|
|
|
|
|
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
|
|
|
|
|
:prop="item.columnName"
|
|
|
|
|
:label="item.columnDesc"
|
|
|
|
|
:sortable="item.sort"
|
|
|
|
|
:width="item.width"
|
|
|
|
|
:show-overflow-tooltip="item.tooltip"
|
|
|
|
|
:key="item.columnName"
|
|
|
|
|
>
|
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
|
|
|
|
|
scope.row[item.columnName]
|
|
|
|
|
}}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table>
|
|
|
|
|
<pagination
|
|
|
|
|
v-show="resultTotal>0"
|
|
|
|
|
:total="resultTotal"
|
|
|
|
|
:page.sync="resultQuery.page"
|
|
|
|
|
:limit.sync="resultQuery.limit"
|
|
|
|
|
@pagination="getCodeList"
|
|
|
|
|
/>
|
|
|
|
|
</el-tab-pane>
|
|
|
|
|
</el-tabs>
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{-->
|
|
|
|
|
<!-- item.lableRuleObj[scope.row[item.columnName]]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-tag-->
|
|
|
|
|
<!-- :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
|
|
|
|
|
<!-- <span>{{-->
|
|
|
|
|
<!-- item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </el-tag>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- fixed="right"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
|
|
|
|
|
<!-- :type="buttonItem.type"-->
|
|
|
|
|
<!-- :size="buttonItem.size"-->
|
|
|
|
|
<!-- :style="buttonItem.style"-->
|
|
|
|
|
<!-- :key="buttonItem"-->
|
|
|
|
|
<!-- v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
|
|
|
|
|
<!-- :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
|
|
|
|
|
<!-- @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
|
|
|
|
|
<!-- >{{ buttonItem.name }}-->
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
|
<!-- v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"-->
|
|
|
|
|
<!-- :prop="item.columnName"-->
|
|
|
|
|
<!-- :label="item.columnDesc"-->
|
|
|
|
|
<!-- :sortable="item.sort"-->
|
|
|
|
|
<!-- :width="item.width"-->
|
|
|
|
|
<!-- :show-overflow-tooltip="item.tooltip"-->
|
|
|
|
|
<!-- :key="item.columnName"-->
|
|
|
|
|
<!-- >-->
|
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
|
<!-- <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
|
|
|
|
|
<!-- scope.row[item.columnName]-->
|
|
|
|
|
<!-- }}</span>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
|
<!-- </template>-->
|
|
|
|
|
<!-- </el-table>-->
|
|
|
|
|
<!-- <pagination-->
|
|
|
|
|
<!-- v-show="resultTotal>0"-->
|
|
|
|
|
<!-- :total="resultTotal"-->
|
|
|
|
|
<!-- :page.sync="resultQuery.page"-->
|
|
|
|
|
<!-- :limit.sync="resultQuery.limit"-->
|
|
|
|
|
<!-- @pagination="getCodeList"-->
|
|
|
|
|
<!-- />-->
|
|
|
|
|
<!-- </el-tab-pane>-->
|
|
|
|
|
<!-- </el-tabs>-->
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
@ -709,7 +709,7 @@ import {
|
|
|
|
|
} from "@/utils/customConfig";
|
|
|
|
|
import {convertDate} from "@/utils/date";
|
|
|
|
|
import {isBlank} from "@/utils/strUtil";
|
|
|
|
|
import {getBizDetailList} from "@/api/inout/orderDetailBiz";
|
|
|
|
|
import {getBizDetailList,finishbizDetail} from "@/api/inout/orderDetailBiz";
|
|
|
|
|
import {getCodeList} from "@/api/inout/code";
|
|
|
|
|
import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
|
|
|
|
|
import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
|
|
|
|
@ -998,7 +998,7 @@ export default {
|
|
|
|
|
//获取订单列表
|
|
|
|
|
getList() {
|
|
|
|
|
this.loading = true;
|
|
|
|
|
getOrderList(this.filterQuery)
|
|
|
|
|
finishbizDetail(this.filterQuery)
|
|
|
|
|
.then((response) => {
|
|
|
|
|
this.loading = false;
|
|
|
|
|
if (response.code === 20000) {
|
|
|
|
@ -1297,20 +1297,20 @@ export default {
|
|
|
|
|
this.getList();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
getHead("IoSplitFinishCode-djxq", "1").then((re) => {
|
|
|
|
|
// 处理返回的数据
|
|
|
|
|
this.tableObj2 = re.data;
|
|
|
|
|
this.tableHeader2 = re.data.tableList;
|
|
|
|
|
this.queryList2 = re.data.queryList;
|
|
|
|
|
this.fromList2 = re.data.fromList;
|
|
|
|
|
});
|
|
|
|
|
getHead("IoSplitFinishCode-smxq", "1").then((re) => {
|
|
|
|
|
// 处理返回的数据
|
|
|
|
|
this.tableObj4 = re.data;
|
|
|
|
|
this.tableHeader4 = re.data.tableList;
|
|
|
|
|
this.queryList4 = re.data.queryList;
|
|
|
|
|
this.fromList4 = re.data.fromList;
|
|
|
|
|
});
|
|
|
|
|
// getHead("IoSplitFinishCode-djxq", "1").then((re) => {
|
|
|
|
|
// // 处理返回的数据
|
|
|
|
|
// this.tableObj2 = re.data;
|
|
|
|
|
// this.tableHeader2 = re.data.tableList;
|
|
|
|
|
// this.queryList2 = re.data.queryList;
|
|
|
|
|
// this.fromList2 = re.data.fromList;
|
|
|
|
|
// });
|
|
|
|
|
// getHead("IoSplitFinishCode-smxq", "1").then((re) => {
|
|
|
|
|
// // 处理返回的数据
|
|
|
|
|
// this.tableObj4 = re.data;
|
|
|
|
|
// this.tableHeader4 = re.data.tableList;
|
|
|
|
|
// this.queryList4 = re.data.queryList;
|
|
|
|
|
// this.fromList4 = re.data.fromList;
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
|
|
|
|
|