Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts:
#	src/views/collect/PanelOrderDeal.vue
20240912_adapter_z
wangwei 11 months ago
commit 68d95678a3

@ -134,7 +134,6 @@
id="inputer" id="inputer"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled" style="ime-mode: disabled"
type="tel" type="tel"
placeholder="请点击输入框进行扫码设置或者扫码录入" placeholder="请点击输入框进行扫码设置或者扫码录入"
@ -173,7 +172,7 @@
</div> </div>
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px"> <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item> <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item> <el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
<el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item> <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
<el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item> <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item> <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@ -192,11 +191,11 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="扫码明细"> <el-tab-pane label="扫码明细">
<prescribeCodePanel <PanelOrderManuTagCode
v-if="panelALive" v-if="panelALive"
:fifoSplit="3" :fifoSplit="3"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeCodePanel> ></PanelOrderManuTagCode>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零明细"> <el-tab-pane label="拆零明细">
@ -242,6 +241,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog"; import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
import prescribeCodePanel from "./PanelOrderTagCode"; import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz"; import PannelOrderBiz from "./PannelOrderBiz";
import {listPage} from "@/api/basic/sysWorkplaceManage"; import {listPage} from "@/api/basic/sysWorkplaceManage";
@ -318,7 +318,7 @@ export default {
}, },
components: { components: {
addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PannelOrderBiz addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel,PanelOrderManuTagCode, PannelOrderBiz
}, },
methods: { methods: {
findFromInvList(val) { findFromInvList(val) {

@ -134,7 +134,6 @@
id="inputer" id="inputer"
@focus="getInputFocus($event)" @focus="getInputFocus($event)"
@keypress.enter.native="enterKey($event)" @keypress.enter.native="enterKey($event)"
ref="inputRef"
style="ime-mode: disabled" style="ime-mode: disabled"
type="tel" type="tel"
placeholder="请点击输入框进行扫码设置或者扫码录入" placeholder="请点击输入框进行扫码设置或者扫码录入"
@ -173,7 +172,7 @@
</div> </div>
<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px"> <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
<el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item> <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
<el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item> <el-descriptions-item label="往来信息">{{ formData.fromCorp }}</el-descriptions-item>
<el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item> <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
<el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item> <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
<el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item> <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
@ -192,11 +191,11 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="扫码明细"> <el-tab-pane label="扫码明细">
<prescribeCodePanel <PanelOrderManuTagCode
v-if="panelALive" v-if="panelALive"
:fifoSplit="3" :fifoSplit="3"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeCodePanel> ></PanelOrderManuTagCode>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零明细"> <el-tab-pane label="拆零明细">
@ -242,6 +241,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog"; import selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
import prescribeCodePanel from "./PanelOrderTagCode"; import prescribeCodePanel from "./PanelOrderTagCode";
import PannelOrderBiz from "./PannelOrderBiz"; import PannelOrderBiz from "./PannelOrderBiz";
import {listPage} from "@/api/basic/sysWorkplaceManage"; import {listPage} from "@/api/basic/sysWorkplaceManage";
@ -318,7 +318,7 @@ export default {
}, },
components: { components: {
addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PannelOrderBiz addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PanelOrderManuTagCode, PannelOrderBiz
}, },
methods: { methods: {
findFromInvList(val) { findFromInvList(val) {

@ -488,6 +488,7 @@ export default {
result: "", result: "",
scanResultType: "success", scanResultType: "success",
msgTip: "当前工位存量提醒:", msgTip: "当前工位存量提醒:",
splitType: null,
}; };
}, },
components: { components: {
@ -1762,31 +1763,31 @@ export default {
<style scoped> <style scoped>
/*.scroll-alert {*/ .scroll-alert {
/* width: 100%; !* 或者你需要的宽度 *!*/ width: 100%; /* 或者你需要的宽度 */
/* overflow: hidden;*/ overflow: hidden;
/* white-space: nowrap;*/ white-space: nowrap;
/* box-sizing: border-box;*/ box-sizing: border-box;
/* !*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*!*/ /*border: 1px solid #f56c6c; !* 类似于 Element UI 警告框的边框 *!*/
/* background-color: rgba(255, 235, 59, 0.1); !* 类似于 Element UI 警告框的背景色 *!*/ background-color: rgba(255, 235, 59, 0.1); /* 类似于 Element UI 警告框的背景色 */
/* padding: 10px;*/ padding: 10px;
/* position: relative;*/ position: relative;
/*}*/ }
/*.scroll-text {*/ .scroll-text {
/* display: inline-block;*/ display: inline-block;
/* padding-left: 100%; !* 初始位置在容器右侧 *!*/ padding-left: 100%; /* 初始位置在容器右侧 */
/* animation: scroll 10s linear infinite; !* 滚动动画 *!*/ animation: scroll 10s linear infinite; /* 滚动动画 */
/*}*/ }
/*@keyframes scroll {*/ @keyframes scroll {
/* from {*/ from {
/* transform: translateX(0);*/ transform: translateX(0);
/* }*/ }
/* to {*/ to {
/* transform: translateX(-100%);*/ transform: translateX(-100%);
/* }*/ }
/*}*/ }
.query-form-item { .query-form-item {
margin-right: 5px; margin-right: 5px;

@ -210,11 +210,11 @@
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="扫码明细"> <el-tab-pane label="扫码明细">
<prescribeCodePanel <PanelOrderManuTagCode
v-if="panelALive" v-if="panelALive"
:fifoSplit="3" :fifoSplit="3"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeCodePanel> ></PanelOrderManuTagCode>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零明细"> <el-tab-pane label="拆零明细">
<prescribeCodePanel <prescribeCodePanel
@ -249,6 +249,7 @@ import {convertDate} from "@/utils/date";
import prescribeOriginPanel from "@/views/collect/PannelOrderBiz"; import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
import prescribeCodePanel from "@/views/collect/PanelOrderTagCode"; import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
import {deleteByOrder, orderPage} from "@/api/collect/collectOrder"; import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
export default { export default {
name: "prescribeAllotIngPanel", name: "prescribeAllotIngPanel",
@ -273,7 +274,7 @@ export default {
showSearch: true, showSearch: true,
filterQuery: { filterQuery: {
billNo: null, billNo: null,
tagStatusList: [-1,2], tagStatusList: [-1, 2],
page: 1, page: 1,
limit: 10, limit: 10,
}, },
@ -308,11 +309,11 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode
}, },
methods: { methods: {
// //
timerAuto(){ timerAuto() {
// //
this.timer = setInterval(() => { this.timer = setInterval(() => {
// //
@ -322,7 +323,7 @@ export default {
// //
// clearInterval(this.timer) // clearInterval(this.timer)
}, },
linkPage(_this,row) { linkPage(_this, row) {
let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode
window.open(url, '_blank'); window.open(url, '_blank');
}, },

@ -208,11 +208,11 @@
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
<el-tab-pane label="扫码明细"> <el-tab-pane label="扫码明细">
<prescribeCodePanel <PanelOrderManuTagCode
v-if="panelALive" v-if="panelALive"
:fifoSplit="3" :fifoSplit="3"
:prescribeData="curRow" :prescribeData="curRow"
></prescribeCodePanel> ></PanelOrderManuTagCode>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="拆零明细"> <el-tab-pane label="拆零明细">
<prescribeCodePanel <prescribeCodePanel
@ -248,6 +248,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
import {executeFuc, getHead} from "@/utils/customConfig"; import {executeFuc, getHead} from "@/utils/customConfig";
import {convertDate} from "@/utils/date"; import {convertDate} from "@/utils/date";
import prescribeCodePanel from "./PanelOrderTagCode"; import prescribeCodePanel from "./PanelOrderTagCode";
import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
import prescribeOriginPanel from "@/views/collect/PannelOrderBiz"; import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
import {orderPage} from "@/api/collect/collectOrder"; import {orderPage} from "@/api/collect/collectOrder";
@ -299,7 +300,7 @@ export default {
}, },
components: { components: {
addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel,PanelOrderManuTagCode
}, },
methods: { methods: {

@ -0,0 +1,290 @@
<template>
<div>
<el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" :row-style="{height:'32px'}" border>
<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' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
<el-table-column
v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
convertDateFun(scope.row[item.columnName])
}}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="codeTotal>0"
:total="codeTotal"
:limit.sync="codeQuery.limit"
:page.sync="codeQuery.page"
@pagination="codeHandleCurrentChange"
></pagination>
</div>
</template>
<script>
import {convertDate} from "@/utils/date";
import {executeFuc, getHead} from "@/utils/customConfig";
import {autoCodeDetail, autoCodeResult, manualCodeDetail} from "@/api/collect/collectOrder";
export default {
/**
* 手动扫码
*/
name: "PanelOrderManuTagCode",
props: {
prescribeData: {
type: Object,
default: null,
required: true
},
//1:2:;3
fifoSplit: {
type: Object,
default: null,
required: true
},
},
data() {
return {
//
//
tableHeader2: [],
queryList2: [],
tableObj2: [],
fromList2: [],
convertDateFun: convertDate,
//-------------end
codeLoading: false,
codeDetailList: [],
codeTotal: 0,
codeQuery: {
fifoSplit: null,
page: 1,
limit: 10,
},
splitType: true,
}
},
methods: {
//------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
},
executeEval(row, expression, defaultRet) {
if (expression) {
return eval(expression);
}
return defaultRet;
},
handleSortChange(column, prop, order) {
if (column.order === 'descending') {
this.query.sort = 'desc'
} else {
this.query.sort = 'asc'
}
this.query.orderBy = column.prop;
this.getList(this);
},
///------------end
getList(_this) {
if (_this.prescribeData == null)
return
if (_this.prescribeData != null) {
_this.codeQuery.page = 1
_this.codeQuery.orderIdFk = this.prescribeData.billNo
}
_this.codeLoading = true;
if (_this.fifoSplit == 3) {
manualCodeDetail(_this.codeQuery).then(res => {
_this.codeLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.codeDetailList = res.data.list
_this.codeLoading = false
}).catch(() => {
_this.codeLoading = false
_this.$message.error("数据加载失败")
})
} else {
_this.codeQuery.fifoSplit = this.fifoSplit
autoCodeResult(_this.codeQuery).then(res => {
_this.codeLoading = false
if (res.code != 20000) {
_this.$message.error(res.message)
return
}
_this.codeDetailList = res.data.list
_this.codeLoading = false
}).catch(() => {
_this.codeLoading = false
_this.$message.error("数据加载失败")
})
}
},
codeHandleCurrentChange(val) {
this.filterQuery.page = val.page;
this.getCodeDetail(this, null);
},
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
rowBackground.height = "32px"
return rowBackground;
},
/**
* 扫码减一
*/
removeOneDialog() {
//todo
},
/**
* 删除条码
*/
deleteDialog() {
//todo
},
},
created() {
if (this.fifoSplit == 2 || this.fifoSplit == 1) {
this.splitType = false
}
if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
getHead("PanelOrderManuTagCode", "1").then((re) => {
//
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
this.getList(this);
});
} else {
this.getPrescribeDetail(this);
}
}
}
</script>
<style scoped>
</style>

@ -234,21 +234,36 @@ export default {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getCodeDetail(this, null); this.getCodeDetail(this, null);
}, },
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
rowBackground.height = "32px"
return rowBackground;
},
}, },
created() { created() {
if (this.fifoSplit == 2 || this.fifoSplit == 1) { if (this.fifoSplit == 2 || this.fifoSplit == 1) {
this.splitType = false this.splitType = false
} }
getHead("prescribePanel-2", "1").then((re) => {
// if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
this.tableObj2 = re.data; getHead("prescribePanel-2", "1").then((re) => {
this.tableHeader2 = re.data.tableList; //
this.queryList2 = re.data.queryList; this.tableObj2 = re.data;
this.fromList2 = re.data.fromList; this.tableHeader2 = re.data.tableList;
this.getList(this); this.queryList2 = re.data.queryList;
}); this.fromList2 = re.data.fromList;
this.getList(this);
});
} else {
this.getPrescribeDetail(this);
}
} }
} }

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="{ height: '32px' }"> <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
<template v-for="(item, index) in tableHeader1"> <template v-for="(item, index) in tableHeader1">
<el-table-column <el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@ -228,16 +228,31 @@ export default {
}) })
}, },
rowStyle({row, rowIndex}) {
let rowBackground = {};
if (row.count != row.scanCount) {
rowBackground.color = '#f60303';
}
rowBackground.height = "32px"
return rowBackground;
},
}, },
created() { created() {
getHead("prescribeOriginPanel", "1").then((re) => { if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
// getHead("prescribeOriginPanel", "1").then((re) => {
this.tableObj1 = re.data; //
this.tableHeader1 = re.data.tableList; this.tableObj1 = re.data;
this.queryList1 = re.data.queryList; this.tableHeader1 = re.data.tableList;
this.fromList1 = re.data.fromList; this.queryList1 = re.data.queryList;
this.fromList1 = re.data.fromList;
this.getPrescribeDetail(this);
});
} else {
this.getPrescribeDetail(this); this.getPrescribeDetail(this);
}); }
if (this.dealStatus == 1) { if (this.dealStatus == 1) {
this.countVisible = false; this.countVisible = false;
} else { } else {

@ -3,18 +3,18 @@
<el-row> <el-row>
<div style="margin: 0px 60px 10px auto; height: 35px; float: right;"> <div style="margin: 0px 60px 10px auto; height: 35px; float: right;">
<el-button-group> <el-button-group>
<!-- <el-button--> <!-- <el-button-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- ref="mainTable"--> <!-- ref="mainTable"-->
<!-- @click.native.stop="selectWarlockBagFunction()"--> <!-- @click.native.stop="selectWarlockBagFunction()"-->
<!-- :loading="loading"--> <!-- :loading="loading"-->
<!-- >术式套包录入--> <!-- >术式套包录入-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button <el-button
type="primary" type="primary"
ref="mainTable" ref="mainTable"
@click.native.stop="selectProductFunction()" @click.native.stop="selectProductFunction()"
:loading="loading" :loading="loading"
>物资录入 >物资录入
</el-button> </el-button>
</el-button-group> </el-button-group>
@ -29,9 +29,9 @@
max-height="350" height="350" ref="multipleTable"> max-height="350" height="350" ref="multipleTable">
<el-table-column label="序号" type="index" width="50"></el-table-column> <el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column <el-table-column
label="DI/物资编码" width="150" label="DI/物资编码" width="150"
prop="nameCode" prop="nameCode"
show-overflow-tooltip show-overflow-tooltip
></el-table-column> ></el-table-column>
<el-table-column width="150" <el-table-column width="150"
label="物资名称" label="物资名称"
@ -122,87 +122,87 @@
</el-table> </el-table>
<el-dialog <el-dialog
title="业务详情-术式套包录入" title="业务详情-术式套包录入"
:visible.sync="selectWarlockBagVisible" :visible.sync="selectWarlockBagVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectWarlockBagVisible" v-if="selectWarlockBagVisible"
:append-to-body='true' :append-to-body='true'
> >
<selectWarlockBag <selectWarlockBag
:closeDialog="closeDialog" :closeDialog="closeDialog"
:data="thisData" :data="thisData"
:type="2" :type="2"
></selectWarlockBag> ></selectWarlockBag>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="业务详情-物资录入" title="业务详情-物资录入"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectProductVisible" v-if="selectProductVisible"
:append-to-body='true' :append-to-body='true'
> >
<stockOrderNewSelectProduct <stockOrderNewSelectProduct
:closeDialog="closeDialog" :closeDialog="closeDialog"
:data="thisData" :data="thisData"
></stockOrderNewSelectProduct> ></stockOrderNewSelectProduct>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="库存物资录入" title="库存物资录入"
:visible.sync="selectInvProductVisible" :visible.sync="selectInvProductVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectInvProductVisible" v-if="selectInvProductVisible"
:append-to-body='true' :append-to-body='true'
> >
<dialogInvProduct <dialogInvProduct
:closeDialog="closeDialogC2" :closeDialog="closeDialogC2"
:invQueryData="invQueryData" :invQueryData="invQueryData"
:orderQuery="thisData" :orderQuery="thisData"
:type="2" :type="2"
></dialogInvProduct> ></dialogInvProduct>
</el-dialog> </el-dialog>
<!-- 绑定产品--> <!-- 绑定产品-->
<el-dialog <el-dialog
title="绑定产品" title="绑定产品"
:visible.sync="selectRlVisible" :visible.sync="selectRlVisible"
width="80%" width="80%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectRlVisible" v-if="selectRlVisible"
append-to-body append-to-body
> >
<selectRlDialog <selectRlDialog
:curRow="curRow" :curRow="curRow"
:type="bizType" :type="bizType"
v-on:selectBindRl="selectBindRl" v-on:selectBindRl="selectBindRl"
v-on:closeBindDialog="closeBindDialog" v-on:closeBindDialog="closeBindDialog"
></selectRlDialog> ></selectRlDialog>
</el-dialog> </el-dialog>
<!-- 绑定供应商--> <!-- 绑定供应商-->
<el-dialog <el-dialog
title="绑定供应商" title="绑定供应商"
:visible.sync="dialogTableVisible" :visible.sync="dialogTableVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="dialogTableVisible" v-if="dialogTableVisible"
width="80%" width="80%"
append-to-body append-to-body
> >
<DialogSelectUnit <DialogSelectUnit
:codeId="curRow" :codeId="curRow"
:type="bizType" :type="bizType"
v-on:selectSupUnit="selectSupUnit" v-on:selectSupUnit="selectSupUnit"
v-on:closeBindDialog="closeBindDialog" v-on:closeBindDialog="closeBindDialog"
></DialogSelectUnit> ></DialogSelectUnit>
</el-dialog> </el-dialog>
@ -272,23 +272,23 @@ export default {
components: { components: {
selectRlDialog, DialogSelectUnit, selectRlDialog, DialogSelectUnit,
stockOrderNewSelectProduct, stockOrderNewSelectProduct,
dialogInvProduct,selectWarlockBag dialogInvProduct, selectWarlockBag
}, },
methods: { methods: {
getOrderDetails() { getOrderDetails() {
this.loading = true; this.loading = true;
this.query.orderId = this.idQuery.billNo; this.query.orderId = this.idQuery.billNo;
getDetailBizs(this.query) // getDetailBizs(this.query) //
.then((response) => { .then((response) => {
this.detailList = response.data.list || []; this.detailList = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
this.loading = false; this.loading = false;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.detailList = []; this.detailList = [];
this.total = 0; this.total = 0;
}); });
}, },
@ -362,7 +362,7 @@ export default {
}, },
selectWarlockBagFunction(){ selectWarlockBagFunction() {
this.thisData = this.idQuery; this.thisData = this.idQuery;
if (this.$isBlank(this.idQuery.action)) { if (this.$isBlank(this.idQuery.action)) {
this.$message.error("单据类型不能为空!") this.$message.error("单据类型不能为空!")
@ -396,22 +396,22 @@ export default {
row.batchNo = null; row.batchNo = null;
} }
updateBizProduct(row) updateBizProduct(row)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success("保存成功!"); this.$message.success("保存成功!");
this.selectedIndex = null; this.selectedIndex = null;
this.refreshPanel(); this.refreshPanel();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.dataList = []; this.dataList = [];
this.pageTotal = 0; this.pageTotal = 0;
}); });
}, },
copyDetail(row) { copyDetail(row) {
@ -423,19 +423,19 @@ export default {
} }
this.loading = true; this.loading = true;
addBizProduct(data) addBizProduct(data)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.getOrderDetails(); this.getOrderDetails();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.dataList = []; this.dataList = [];
this.pageTotal = 0; this.pageTotal = 0;
}); });
}, },
deleteDetail(row) { deleteDetail(row) {
@ -444,19 +444,19 @@ export default {
} }
this.loading = true; this.loading = true;
delBizProduct(data) delBizProduct(data)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.getOrderDetails(); this.getOrderDetails();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.dataList = []; this.dataList = [];
this.pageTotal = 0; this.pageTotal = 0;
}); });
}, },
bindRl(val) { bindRl(val) {
this.curRow = val; this.curRow = val;
@ -474,12 +474,12 @@ export default {
bindRlFk: row.id, bindRlFk: row.id,
}; };
updateBizBind(query).then((response) => { updateBizBind(query).then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
this.$message.success("绑定成功"); this.$message.success("绑定成功");
this.getOrderDetails(); this.getOrderDetails();
} else } else
this.$message.error(response.message); this.$message.error(response.message);
} }
).catch(() => { ).catch(() => {
}); });
@ -516,12 +516,12 @@ export default {
watch: { watch: {
'idQuery.billNo': 'idQuery.billNo':
{ {
handler() { handler() {
this.refreshOrder(this.idQuery); this.refreshOrder(this.idQuery);
}
,
} }
,
}
} }
, ,

Loading…
Cancel
Save