From 032a92d28ca42d28f35894405d975c7313154e5e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 18 十二月 2025 11:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 26
src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue | 755 ++++++++++++++++++++++++++++++++++
src/views/sell/sellOut/sellOutBill.vue | 22
src/views/ProductInBill/Kf_ProductInBillList.vue | 22
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue | 22
src/views/gyMaterial/GyMaterial.vue | 422 ++++--------------
src/store/modules/permission.js | 15
src/router/index.js | 25 +
8 files changed, 980 insertions(+), 329 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 81d3b80..345c7b7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -138,6 +138,31 @@
],
},
//#endregion
+
+ //#region 鏉$爜涓绘尅
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/warehouse/barcodeMaster/Gy_BarCodeBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/warehouse/barcodeMaster/Gy_BarCodeBillList",
+ component: () =>
+ import("@/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue"),
+ name: "Gy_BarCodeBillList",
+ meta: {
+ title: "鏉$爜涓绘。",
+ activeMenu: "warehouse/barcodeMaster",
+ },
+ },
+ ],
+ },
+ //#endregion
//#endregion
//#region 浠撳瓨绠$悊
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 52ab7b5..47c18d8 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -423,6 +423,21 @@
name: "Gy_BarCodeBill",
path: "Gy_BarCodeBill",
},
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
+ title: "鏉$爜涓绘。",
+ },
+ component: () =>
+ import(
+ "@/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue"
+ ),
+ hidden: false,
+ name: "Gy_BarCodeBillList",
+ path: "Gy_BarCodeBillList",
+ },
],
},
],
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
index 1b1a2e0..3192691 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue
@@ -150,6 +150,9 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉$爜鏄庣粏</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
+ </el-col>
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -195,6 +198,8 @@
</el-dialog>
<!-- 鏉$爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</div>
</template>
@@ -205,11 +210,12 @@
import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉$爜鏄庣粏缁勪欢
+import PackStockDetail from '@/views/component/PackStockDetail' //鏉$爜鏄庣粏缁勪欢
import Edit from '@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit' //缂栬緫椤甸潰缁勪欢
export default {
name: 'Kf_POStockInBillList',
- components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ components: { RowSettings, Edit, PrintList,BarCodeDetail,PackStockDetail },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -265,6 +271,7 @@
openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
barCodeDetailShow: false, //鏉$爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ packStockDetailShow:false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
@@ -863,6 +870,19 @@
},
//#endregion
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
+
//#region 閫�鍑�
close() {
// this.reset()
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index cfafb17..66eb35d 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -141,6 +141,9 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉$爜鏄庣粏</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
+ </el-col>
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -186,6 +189,8 @@
</el-dialog>
<!-- 鏉$爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</div>
</template>
@@ -196,11 +201,12 @@
import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉$爜鏄庣粏缁勪欢
+import PackStockDetail from '@/views/component/PackStockDetail' //鏉$爜鏄庣粏缁勪欢
import Edit from '@/views/ProductInBill/Kf_ProductInBillEdit' //缂栬緫椤甸潰缁勪欢
export default {
name: 'Kf_ProductInBillList',
- components: { RowSettings, Edit, PrintList,BarCodeDetail },
+ components: { RowSettings, Edit, PrintList,BarCodeDetail,PackStockDetail },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -253,6 +259,7 @@
openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
barCodeDetailShow: false, //鏉$爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ packStockDetailShow:false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
@@ -837,6 +844,19 @@
})
},
//#endregion
+
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
//#region 閫�鍑�
close() {
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index 5d8df4a..7a86447 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -3,65 +3,28 @@
<el-card style="margin-bottom: 10px">
<el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
<el-form-item label="鐗╂枡浠g爜" prop="HNumber">
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" style="width: 160px" />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="HName">
- <el-input
- v-model="queryParams.HName"
- placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" style="width: 160px" />
</el-form-item>
<el-form-item label="缁勭粐鍚嶇О" prop="HOrgID">
- <el-select
- v-model="queryParams.HOrgID"
- placeholder="璇烽�夋嫨缁勭粐"
- style="width: 160px"
- >
- <el-option
- v-for="(item, index) in organizationOptions"
- :key="index"
- :label="item.Name"
- :value="item.ID.toString()"
- />
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐" style="width: 160px">
+ <el-option v-for="(item, index) in organizationOptions" :key="index" :label="item.Name"
+ :value="item.ID.toString()" />
</el-select>
</el-form-item>
<el-form-item label="椤圭洰鍙�" prop="HProject">
- <el-select
- v-model="queryParams.HProject"
- placeholder="璇烽�夋嫨椤圭洰鍙�"
- style="width: 160px"
- >
- <el-option
- v-for="item in projectOptions"
- :key="item.HName"
- :label="item.HName"
- :value="item.HName"
- />
+ <el-select v-model="queryParams.HProject" placeholder="璇烽�夋嫨椤圭洰鍙�" style="width: 160px">
+ <el-option v-for="item in projectOptions" :key="item.HName" :label="item.HName" :value="item.HName" />
</el-select>
</el-form-item>
<el-form-item label="閲嶆柊鍚屾">
- <el-input
- v-model="queryParams.HNumber2"
- placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- style="width: 160px"
- />
- <el-button
- type="primary"
- size="mini"
- @click="handleResCnz"
- style="margin-left: 10px"
- >閲嶆柊鍚屾</el-button
- >
+ <el-input v-model="queryParams.HNumber2" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" style="width: 160px" />
+ <el-button type="primary" size="mini" @click="handleResCnz" style="margin-left: 10px">閲嶆柊鍚屾</el-button>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -69,11 +32,7 @@
<el-collapse v-model="activeCollapse" class="filter-collapse">
<el-collapse-item title="鏇村" name="more">
<el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
- <el-input
- v-model="queryParams.HModel"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
- style="width: 160px"
- />
+ <el-input v-model="queryParams.HModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" style="width: 160px" />
</el-form-item>
<el-card class="box-card" style="margin-top: 20px">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
@@ -81,126 +40,66 @@
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="" label=""></el-option> -->
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="0" label=""></el-option> -->
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="0" label=""></el-option> -->
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="0" label=""></el-option> -->
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent1"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label-width="0">
<el-row>
<el-col :span="7">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="0" label=""></el-option> -->
- <el-option
- v-for="(item, index) in visibleColumns"
- :key="index"
- :label="item.title"
- :value="item.field"
- ></el-option>
+ <el-option v-for="(item, index) in visibleColumns" :key="index" :label="item.title"
+ :value="item.field"></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" style="width: 100%">
<!-- <el-option value="0" label=""></el-option> -->
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
</el-col>
</el-row>
</el-form-item>
@@ -209,15 +108,13 @@
</el-collapse-item>
</el-collapse>
</el-form>
- <div
- style="
+ <div style="
text-align: center;
font-size: 15px;
font-weight: bold;
color: #fc9393;
margin: 20px 0;
- "
- >
+ ">
{{ currentFilterScheme }}
</div>
</el-card>
@@ -241,25 +138,19 @@
<el-button size="mini" :disabled="single" @click="handleEdit">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" size="mini" :disabled="single" @click="handleDelete"
- >鍒犻櫎</el-button
- >
+ <el-button type="danger" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
<el-button size="mini" :disabled="single" @click="handleAudit(0)">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button size="mini" :disabled="single" @click="handleAudit(1)"
- >鍙嶅鏍�</el-button
- >
+ <el-button size="mini" :disabled="single" @click="handleAudit(1)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button size="mini" :disabled="single" @click="handleStop(0)">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button size="mini" :disabled="single" @click="handleStop(1)"
- >鍙嶇鐢�</el-button
- >
+ <el-button size="mini" :disabled="single" @click="handleStop(1)">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
<el-button size="mini" @click="handleColumnSetting">鍒楄缃�</el-button>
@@ -268,14 +159,10 @@
<el-button size="mini" @click="handleButtonSetting">鎸夐挳璁剧疆</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="handleSaveScheme"
- >淇濆瓨鏂规</el-button
- >
+ <el-button type="primary" size="mini" @click="handleSaveScheme">淇濆瓨鏂规</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="handleReadScheme"
- >璇诲彇鏂规</el-button
- >
+ <el-button type="primary" size="mini" @click="handleReadScheme">璇诲彇鏂规</el-button>
</el-col>
<el-col :span="1.5">
<el-button size="mini" @click="handleRefresh">鍒锋柊</el-button>
@@ -287,68 +174,41 @@
<el-button type="primary" size="mini" @click="handleCorrect">鎵规敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" size="mini" @click="handleCorrect2"
- >鎵规敼(鏂规2)</el-button
- >
+ <el-button type="primary" size="mini" @click="handleCorrect2">鎵规敼(鏂规2)</el-button>
</el-col>
</el-row>
<el-row :gutter="10" style="margin-top: 10px">
<el-col :span="6">
- <el-card
- style="height: 600px; overflow: hidden; display: flex; flex-direction: column"
- >
+ <el-card style="height: 600px; overflow: hidden; display: flex; flex-direction: column">
<div slot="header">
<span>鐗╂枡鍒嗙被</span>
</div>
<div style="flex: 1; overflow: auto; margin-bottom: 10px">
- <el-tree
- :data="treeData"
- :props="treeProps"
- node-key="id"
- default-expand-all
- :expand-on-click-node="false"
- @node-click="handleTreeNodeClick"
- :highlight-current="true"
- class="custom-tree"
- >
+ <el-tree :data="treeData" :props="treeProps" node-key="id" default-expand-all :expand-on-click-node="false"
+ @node-click="handleTreeNodeClick" :highlight-current="true" class="custom-tree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span>{{ node.label }}</span>
</span>
</el-tree>
</div>
<div style="height: 200px; border: 1px solid #ebeef5; border-radius: 4px">
- <el-carousel
- :autoplay="false"
- indicator-position="none"
- height="200px"
- ref="carousel"
- >
+ <el-carousel :autoplay="false" indicator-position="none" height="200px" ref="carousel">
<el-carousel-item v-for="(item, index) in fileList" :key="index">
<div v-if="item.type === 'image'" class="carousel-item">
- <img
- :src="item.url"
- :alt="item.name"
- style="width: 100%; height: 100%; object-fit: contain"
- @click="previewImg(item.url)"
- />
+ <img :src="item.url" :alt="item.name" style="width: 100%; height: 100%; object-fit: contain"
+ @click="previewImg(item.url)" />
</div>
<div v-else-if="item.type === 'pdf'" class="carousel-item">
- <embed
- :src="item.url"
- type="application/pdf"
- style="width: 100%; height: 100%"
- />
+ <embed :src="item.url" type="application/pdf" style="width: 100%; height: 100%" />
</div>
<div v-else class="carousel-item">
- <h1
- style="
+ <h1 style="
text-align: center;
line-height: 180px;
color: red;
font-weight: bolder;
- "
- >
+ ">
鏆傛湭涓婁紶鏂囦欢
</h1>
</div>
@@ -360,45 +220,21 @@
<el-col :span="18">
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- height="600"
- @selection-change="handleSelectionChange"
- border
- @row-click="handleRowClick"
- @row-dblclick="handleDblclick"
- :row-style="rowStyle"
- v-if="tableShow"
- >
+ <el-table :data="tableData" ref="tableData" height="600" @selection-change="handleSelectionChange" border
+ @row-click="handleRowClick" @row-dblclick="handleDblclick" :row-style="rowStyle" v-if="tableShow">
<el-table-column type="selection" width="55" align="center" fixed="left" />
<el-table-column prop="hmainid" label="鍗曟嵁ID" v-if="false" />
- <el-table-column
- v-for="(item, index) in btList"
- :key="index"
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- v-if="!item.hide"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column v-for="(item, index) in btList" :key="index" :align="item.align" :prop="item.field"
+ :label="item.title" :width="item.width" v-if="!item.hide" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
<template slot-scope="{ row, column }">
<div :style="item.style">
- <el-button
- type="text"
- @click="handleMaterialCodeClick(row)"
- v-if="column.property === '鐗╂枡浠g爜'"
- >{{ row[column.property] }}</el-button
- >
- <span
- v-else-if="
- (column.property || '').includes('鏃堕棿') ||
- (column.property || '').includes('鏃ユ湡')
- "
- >
+ <el-button type="text" @click="handleMaterialCodeClick(row)" v-if="column.property === '鐗╂枡浠g爜'">{{
+ row[column.property] }}</el-button>
+ <span v-else-if="
+ (column.property || '').includes('鏃堕棿') ||
+ (column.property || '').includes('鏃ユ湡')
+ ">
{{ formatDate(row[column.property]) }}
</span>
<span v-else>{{ row[column.property] }}</span>
@@ -406,68 +242,30 @@
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="handleQuery"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="handleQuery" />
</div>
</el-col>
</el-row>
- <el-dialog
- :visible.sync="previewVisible"
- width="80%"
- top="5vh"
- :before-close="handlePreviewClose"
- >
+ <el-dialog :visible.sync="previewVisible" width="80%" top="5vh" :before-close="handlePreviewClose">
<img :src="previewImage" style="width: 100%" />
</el-dialog>
- <el-dialog
- title="闅愯棌鍒楄缃�"
- :visible.sync="openColumnSetting"
- width="816px"
- append-to-body
- >
- <RowSettings
- :colName="btResList"
- :HModName="HModName"
- @rowEditClose="columnSettingClose"
- v-if="columnSettingShow"
- />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openColumnSetting" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="columnSettingClose"
+ v-if="columnSettingShow" />
</el-dialog>
- <el-dialog
- :title="editTitle"
- :visible.sync="openEdit"
- width="95%"
- top="2vh"
- append-to-body
- class="material-edit-dialog"
- :before-close="closeEdit"
- >
- <MaterialEdit
- v-if="editShow"
- :hID="currentEditId"
- :OperationType="OperationType"
- :HMaterTypeID="currentMaterTypeID"
- @close="handleEditClose"
- />
+ <el-dialog :title="editTitle" :visible.sync="openEdit" width="95%" top="2vh" append-to-body
+ class="material-edit-dialog" :before-close="closeEdit">
+ <MaterialEdit v-if="editShow" :hID="currentEditId" :OperationType="OperationType"
+ :HMaterTypeID="currentMaterTypeID" @close="handleEditClose" />
</el-dialog>
<MaterialCorrection :visible.sync="openCorrect" @close="closeCorrect" />
- <el-dialog
- title="鎵规敼(鏂规2)"
- :visible.sync="openCorrect2"
- width="1480px"
- append-to-body
- :before-close="closeCorrect2"
- >
+ <el-dialog title="鎵规敼(鏂规2)" :visible.sync="openCorrect2" width="1480px" append-to-body :before-close="closeCorrect2">
<div style="text-align: center; padding: 50px">
<h2>鐗╂枡鎵规敼鍔熻兘(鏂规2)</h2>
<p>鐗╂枡鎵规敼鍔熻兘(鏂规2)寰呭悗缁紑鍙�</p>
@@ -475,29 +273,13 @@
</div>
</el-dialog>
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
- <el-button type="primary" size="mini" @click="handleImportSubmit"
- >瀵煎叆鏁版嵁</el-button
- >
- <el-button type="primary" size="mini" @click="upload.open = false"
- >閫� 鍑�</el-button
- >
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-button type="primary" size="mini" @click="handleImportSubmit">瀵煎叆鏁版嵁</el-button>
+ <el-button type="primary" size="mini" @click="upload.open = false">閫� 鍑�</el-button>
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary" size="mini">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
@@ -508,13 +290,8 @@
<el-table-column label="鐗╂枡鍒嗙被" prop="鐗╂枡鍒嗙被" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.$index)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -615,6 +392,7 @@
sWhere: "",
selectedRow: null,
+ selRowList: [],
ids: [],
single: true,
multiple: true,
@@ -1005,7 +783,7 @@
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
})
- .catch(() => {});
+ .catch(() => { });
},
handleAudit(isAudit) {
@@ -1114,7 +892,11 @@
handleRowClick(row, column, event) {
if (this.openPage) {
+ if (this.openPage == 'Gy_BarCodeBill') {
+ this.$emit('deptEmit', this.selRowList, 3)
+ }else{
this.$emit("deptEmit", row, 3);
+ }
}
if (this.checkIsIframe()) {
// 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
@@ -1189,7 +971,13 @@
// 鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
if (this.openPage) {
- this.$emit("deptEmitDb", row, 3);
+ if (this.openPage == 'Gy_BarCodeBill') {
+ let list = []
+ list.push(row)
+ this.$emit("deptEmitDb", list, 3)
+ } else {
+ this.$emit("deptEmitDb", row, 3);
+ }
}
if (this.checkIsIframe()) {
// IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
@@ -1201,14 +989,15 @@
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.hmainid);
+ this.selRowList = selection
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
this.selectedRow = selection[0];
}
- // if(this.openPage){
- // this.$emit('deptEmit', this.selectedRow, 3)
- // }
+ if (this.openPage == 'Gy_BarCodeBill') {
+ this.$emit('deptEmit', this.selRowList, 3)
+ }
},
// 缂栬緫鍏抽棴鍥炶皟
handleEditClose() {
@@ -1254,8 +1043,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- response.Message +
- "</div>",
+ response.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1279,8 +1068,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1336,8 +1125,7 @@
.searchImg {
height: 60px;
- background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 24 24"><path fill="%23a0a0a0" d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>')
- no-repeat center;
+ background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="60" height="60" viewBox="0 0 24 24"><path fill="%23a0a0a0" d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>') no-repeat center;
margin-top: 10px;
}
@@ -1367,7 +1155,7 @@
width: 100%;
}
-.el-tree-node.is-current > .el-tree-node__content {
+.el-tree-node.is-current>.el-tree-node__content {
background-color: #aef0f7;
}
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index c245bcf..cf5ab8f 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -314,6 +314,9 @@
>鏉$爜鏄庣粏</el-button
>
</el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
+ </el-col>
</el-row>
<div class="tableBox" v-loading="loading">
<el-table
@@ -424,6 +427,8 @@
</el-dialog>
<!-- 鏉$爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</div>
</template>
@@ -434,11 +439,12 @@
import Edit from "@/views/sell/sellOut/sellOutBillEdit";
import PrintList from "@/views/component/printList";
import BarCodeDetail from "@/views/component/BarCodeDetail"; //鏉$爜鏄庣粏缁勪欢
+import PackStockDetail from '@/views/component/PackStockDetail' //鏉$爜鏄庣粏缁勪欢
import moment from "moment";
export default {
name: "SellOutBill",
- components: { RowSettings, Edit, PrintList, BarCodeDetail },
+ components: { RowSettings, Edit, PrintList, BarCodeDetail,PackStockDetail },
data() {
return {
activeSeach: "",
@@ -449,6 +455,7 @@
openPrintList: false,
printListShow: false,
barCodeDetailShow: false, //鏉$爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ packStockDetailShow:false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -1162,6 +1169,19 @@
});
},
//#endregion
+
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index e05983a..2ffd416 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -786,6 +786,7 @@
},
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
+ console.log(deptRow)
if (num) {
if (num == 'gyProperty') {
this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
@@ -793,27 +794,34 @@
this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["杈呭姪灞炴�т唬鐮�"];
this.propertyShow = false;
this.openData = false;
+
} else if (num == 3) {
- this.editWlxxData[this.zbIndex].HMaterID = deptRow.HItemID;
- this.editWlxxData[this.zbIndex].HMaterNumber = deptRow.鐗╂枡浠g爜;
- this.editWlxxData[this.zbIndex].HMaterName = deptRow.鐗╂枡鍚嶇О;
- this.editWlxxData[this.zbIndex].HMaterModel = deptRow.瑙勬牸鍨嬪彿
- this.editWlxxData[this.zbIndex].HUnitID = deptRow.HUnitID;
- this.editWlxxData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅鍚嶇О
- this.editWlxxData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+ this.editWlxxData = []
+ for (var i = 0; i < deptRow.length; i++) {
+ this.editWlxxData.push({
+ "HMaterID": deptRow[i].HItemID,
+ "HMaterNumber": deptRow[i].鐗╂枡浠g爜,
+ "HMaterName": deptRow[i].鐗╂枡鍚嶇О,
+ "HMaterModel": deptRow[i].瑙勬牸鍨嬪彿,
+ "HUnitID": deptRow[i].HUnitID,
+ "HUnitNumber": deptRow[i].璁¢噺鍗曚綅浠g爜,
+ "HUnitName": deptRow[i].璁¢噺鍗曚綅,
+ "HAuxQty": 0,
+ })
+ }
this.materialShow = false
this.openData = false
}
return
}
- console.log(deptRow)
+
if (deptRow.length > 0) {
this.zbDataShow = false
this.editWlxxData = []
var list = []
var BillSelect = []
for (var i = 0; i < deptRow.length; i++) {
- if (deptRow[i].閮ㄩ棬 != "" && deptRow[i].閮ㄩ棬 != null) {
+ if (!deptRow[i].閮ㄩ棬) {
list.push(deptRow[i].閮ㄩ棬)
}
BillSelect.push({
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
new file mode 100644
index 0000000..ae933a5
--- /dev/null
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBillList.vue
@@ -0,0 +1,755 @@
+<template>
+ <div style="padding: 10px;">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+ <el-date-picker v-model="queryParams.sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker v-model="queryParams.eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鏃ユ湡闂撮殧">
+ <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+ <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏉$爜缂栧彿" prop="HBarCode">
+ <el-input v-model="queryParams.HBarCode" placeholder="璇疯緭鍏ユ潯鐮佺紪鍙�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="HOrgID">
+ <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
+ <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡浠g爜" prop="HMaterNumber">
+ <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label-width="78px">
+ <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+ <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+ </el-form-item>
+ <el-collapse v-model="activeSeach">
+ <el-collapse-item title="鏇村" name="1">
+ <el-card class="box-card">
+ <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </el-row>
+ <el-form-item label-width="0">
+ <el-row>
+ <el-col :span="7">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+ :value="item.field"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="6" style="padding: 0 10px;">
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange">
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ </el-col>
+ <el-col :span="11">
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+ @keyup.enter.native="handleQuery" />
+ </el-col>
+ </el-row>
+ </el-form-item>
+ </div>
+ </el-card>
+ </el-collapse-item>
+ </el-collapse>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+ </el-col>
+ </el-row>
+ <div class="tableBox" v-loading="loading">
+ <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+ @cell-dblclick="handleDblclick" v-if="tableShow">
+ <template v-for="(item, index) in btList">
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+ :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+ v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
+ <template slot-scope="{row, column }">
+ <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+ <div :style="item.style">
+ <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+ <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{
+ row.鍗曟嵁鍙�
+ }}</el-button>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ </template>
+ </el-table>
+ <!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
+ <!-- 鍒楄缃� -->
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" HModName="Kf_POStockInBillList" @rowEditClose="rowSetClose"
+ v-if="rowHideShow" />
+ </el-dialog>
+ <!-- 鎵撳嵃 -->
+ <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+ <PrintList :linterid="rowSel.toString()" :MyMsg="rowSel.toString()" Type="HGy_BarCodeBillList"
+ HModName="HGy_BarCodeBillList" @rowEditClose="rowSetClose" v-if="printListShow" />
+ </el-dialog>
+ </div>
+ </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment'; //瀵煎嚭缁勪欢
+import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
+import PrintList from "@/views/component/printList"; //鎵撳嵃缁勪欢
+
+export default {
+ name: 'Gy_BarCodeBillList',
+ components: { RowSettings, PrintList},
+ data() {
+ return {
+ baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
+
+ HInterID: null,
+ checkDataList: [], //琛ㄦ牸閫変腑鏁版嵁闆嗗悎
+ rowSel: [], //鐢ㄤ簬鎵撳嵃鐨勬暟鎹泦鍚�
+
+ rqsgList: [ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鏁版嵁
+ { label: '浠婂ぉ', value: 0 },
+ { label: '杩戜袱澶�', value: 1 },
+ { label: '杩戜笁澶�', value: 2 },
+ { label: '杩戝洓澶�', value: 3 },
+ { label: '杩戜簲澶�', value: 4 },
+ { label: '杩戝叚澶�', value: 5 },
+ { label: '杩戜竷澶�', value: 6 },
+ { label: '杩�30澶�', value: 29 },
+ { label: '杩戝崐骞�', value: 180 },
+ { label: '杩戜竴骞�', value: 365 },
+ ],
+ organizationList: [], //缁勭粐鍒楄〃
+ btList: [], //鍒楄〃琛ㄥご瀛楁鍒楄〃
+ comparatorList: [ //杩愮畻鏍囪瘑涓嬫媺鍒楄〃
+ { label: '=', value: '=' },
+ { label: '>=', value: '>=' },
+ { label: '>', value: '>' },
+ { label: '<=', value: '<=' },
+ { label: '<', value: '<' },
+ { label: '<>', value: '<>' },
+ { label: '鍖呭惈', value: '7' },
+ { label: '宸﹀寘鍚�', value: '8' },
+ { label: '鍙冲寘鍚�', value: '9' },
+ { label: '涓嶅寘鍚�', value: '10' },
+ ],
+
+ dialogTitle: '', // 寮圭獥鏍囬
+ title: "", // 寮瑰嚭灞傛爣棰�
+ open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
+ loading: true, // 閬僵灞�
+
+ activeSeach: '',
+ openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
+ openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ btnHideShow: false, //鎸夐挳缁勪欢鏄剧ず鏍囪
+ openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
+ rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+
+ // 鏌ヨ鍙傛暟
+ sWhere: '', // 鎷兼帴杩囨护鏉′欢
+ queryParams: { // form鏁版嵁
+ HBarCode: '',
+ HInitTimeCycle: 29,
+ sTime: '',
+ eTime: '',
+ HOrgID: 0,
+ HSourceBillNo: '',
+ HMaterNumumber: '',
+ HMaterName: '',
+
+
+ ColName: '',
+ Comparator: '',
+ ColContent: '',
+ ColName1: '',
+ Comparator1: '',
+ ColContent1: '',
+ ColName2: '',
+ Comparator2: '',
+ ColContent2: '',
+ },
+
+ page: 1, //page椤电储寮�
+ pageSize: 0, //page椤甸潰璁板綍鏁�
+ total: 0, //璁板綍鍚堣鏁�
+ tableShow: true, // table鏄剧ず鏍囪
+ totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
+ tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
+ ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+ lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+ lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+ selectedRow: null, // 褰撳墠閫変腑鐨勮
+ rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
+
+ tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
+ titleData: [], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
+ dataList: [], // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
+ };
+ },
+ created() {
+ this.fetchData() //鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ this.riqiChange()
+ this.handleQuery();
+ },
+
+ methods: {
+ //#region 璁剧疆琛ㄥご
+ renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+ let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+ span.innerText = column.label
+ //涓存椂鎻掑叆 document
+ document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+ document.body.removeChild(span)
+ return h(span, column.label)
+ },
+ //#endregion
+
+ //#region 鐐瑰嚮琛�
+ handleRowClick(row, column, event) {
+ this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+ this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+ this.lastSelectedRowIndex = this.tableData.indexOf(row);
+ this.$refs.tableData.toggleRowSelection(row);
+ },
+ //#endregion
+
+ //#region 閫変腑琛岄珮浜牱寮�
+ rowStyle({ row, rowIndex }) {
+ if (this.ids.includes(row.hmainid)) {
+ return { "background": "#ecf5ff" }
+ }
+ },
+ //#endregion
+
+ //#region 鍙屽嚮琛�
+ handleDblclick(row, column, cell, event) {
+ },
+ //#endregion
+
+ //#region 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ // this.rowForm = {}
+ checkDataList = selection;
+ this.ids = selection.map(item => item.hmainid)
+ this.single = selection.length != 1
+ this.multiple = !selection.length
+ if (!this.single) {
+ this.rowForm = selection[0]
+ }
+ },
+ //#endregion
+
+ //#region 鏍规嵁鏃ユ湡闂撮殧锛岃缃紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ riqiChange() {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+ const yyyyS = start.getFullYear();
+ const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddS = String(start.getDate()).padStart(2, '0');
+ const yyyyE = end.getFullYear();
+ const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
+ const ddE = String(end.getDate()).padStart(2, '0');
+ this.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
+ this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
+ },
+ //#endregion
+
+ //#region 鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+ fetchData() {
+ axios.get(this.baseURL + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ },
+ //#endregion
+
+ //#region 閲嶇疆
+ resetQuery() {
+ this.sWhere = ''
+ this.queryParams = {
+ HBarCode: '',
+ HInitTimeCycle: 29,
+ HSourceBillNo: '',
+ HMaterNumber: '',
+ HMaterName: '',
+
+ ColName: '',
+ Comparator: '',
+ ColContent: '',
+ ColName1: '',
+ Comparator1: '',
+ ColContent1: '',
+ ColName2: '',
+ Comparator2: '',
+ ColContent2: '',
+
+ }
+ this.riqiChange()
+ this.resetForm("queryForm")
+ this.handleQuery()
+ },
+ //#endregion
+
+ //#region 蹇�熻繃婊�
+ handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like''%" + this.queryParams.ColContent + "%''";
+ break;
+ case "8":
+ com = "like''%" + this.queryParams.ColContent + "''";
+ break;
+ case "9":
+ com = "like''" + this.queryParams.ColContent + "%''";
+ break;
+ case "10":
+ com = "not like''%" + this.queryParams.ColContent + "%''";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "''" + this.queryParams.ColContent + "''";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like''%" + this.queryParams.ColContent1 + "%''";
+ break;
+ case "8":
+ com1 = "like''%" + this.queryParams.ColContent1 + "''";
+ break;
+ case "9":
+ com1 = "like''" + this.queryParams.ColContent1 + "%''";
+ break;
+ case "10":
+ com1 = "not like''%" + this.queryParams.ColContent1 + "%''";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "''" + this.queryParams.ColContent1 + "''";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like''%" + this.queryParams.ColContent2 + "%''";
+ break;
+ case "8":
+ com2 = "like''%" + this.queryParams.ColContent2 + "''";
+ break;
+ case "9":
+ com2 = "like''" + this.queryParams.ColContent2 + "%''";
+ break;
+ case "10":
+ com2 = "not like''%" + this.queryParams.ColContent2 + "%''";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "''" + this.queryParams.ColContent + "''";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.queryParams.sTime) {
+ this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
+ this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
+ console.log(this.queryParams.sTime, this.queryParams.eTime)
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= ''" + this.queryParams.sTime + "''" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= ''" + this.queryParams.eTime + "''";
+ }
+ if (this.queryParams.HBarCode) {
+ this.sWhere += " and 鏉$爜缂栧彿 like ''%" + this.queryParams.HBarCode + "%''";
+ }
+ if (this.queryParams.HSupName) {
+ this.sWhere += " and 婧愬崟鍗曞彿 like ''%" + this.queryParams.HSourceBillNo + "%''";
+ }
+ if (this.queryParams.HMaterNumber) {
+ this.sWhere += " and 鐗╂枡浠g爜 like ''%" + this.queryParams.HMaterNumber + "%''";
+ }
+ if (this.queryParams.HMaterName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like ''%" + this.queryParams.HMaterName + "%''";
+ }
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HStockOrgID = ''" + this.queryParams.HOrgID + "''";
+ }
+ this.getList()
+ },
+ //#endregion
+
+ //#region 鏌ヨ
+ getList() {
+ this.pageSize = 50
+ if (this.pageSize == 0) {
+ this.pageSize = 50
+ }
+ this.tableShow = false
+ this.loading = true
+
+ // 鍒楄〃鏌ヨ
+ axios.get(this.baseURL + '/Gy_BarCodeBillList/page', {
+ params: {
+ "sWhere": this.sWhere,
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize
+ },
+ }).then(response => {
+ this.tyResList = response.data.data//鎬绘暟鎹�
+ let data1 = response.data
+ let option = []
+ if (data1.code == 1) {
+ this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = [];//鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁$畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁$畻鍒�
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ option.cols = [col]
+ this.dataList = option
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ let HModName = "Gy_BarCodeBillList"
+ this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+
+ //#region 鍚堣琛屾暟鎹鐞�
+ getSummaries(param) {
+ const { columns, data } = param;
+ const sums = [];
+ columns.forEach((column, index) => {
+ if (index === 0) {
+ sums[index] = '鍚堣';
+ return;
+ }
+ const values = data.map(item => Number(item[column.property]));
+ if (this.totalNameList[index].totalRow) {
+ if (!values.every(value => isNaN(value))) {
+ sums[index] = values.reduce((prev, curr) => {
+ const value = Number(curr);
+ if (!isNaN(value)) {
+ return prev + curr;
+ } else {
+ return prev;
+ }
+ }, 0)
+
+ } else {
+ sums[index] = '';
+ }
+ }
+ }, 1000);
+ return sums;
+ },
+ //#endregion
+
+ //#endregion
+
+ //#region 鍒犻櫎
+ handleDelete() {
+ },
+ //#endregion
+
+ //#region 鍒楄缃�
+ handleRowHide() {
+ this.rowHideShow = true
+ this.openRowHide = true
+ },
+ rowSetClose(val) {
+ this.rowHideShow = false
+ this.tableShow = true
+ this.openRowHide = val
+ this.handleQuery()
+ },
+ DisPlay_HideColumn(HModName, user, option, dataOption) {
+ this.totalNameList = []
+ axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ params: {
+ "HModName": HModName,
+ "user": user,
+ },
+ }).then(res => {
+ let data1 = res.data
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ } else {
+ option.cols[0][i + 1]["totalRow"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ newCols[0].push(option.cols[0][i + 1]);
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i + 1]["fixed"] != null) {
+ option.cols[0][i + 1]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ }
+ this.btList = option.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ if (data1.data[0].HPageSize == 0) {
+ this.pageSize = 50
+ } else {
+ this.pageSize = data1.data[0].HPageSize
+ }
+ this.tableData = option.data
+ this.tableShow = true
+ this.loading = false
+ } else {
+ this.btList = dataOption.cols[0]
+ this.btList.map(item => {
+ if (!item.hide) {
+ this.totalNameList.push(item)
+ }
+ })
+ this.tableData = dataOption.data
+ this.tableShow = true
+ this.loading = false
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
+ //#region 鎸夐挳璁剧疆
+ handleBtnHide() {
+ this.btnHideShow = true
+ this.openBtnHide = true
+ },
+ //#endregion
+
+ //#region 瀵煎嚭
+ handleExport() {
+ const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+ const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+ this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+ this.$XLSX.writeFile(wb, `Gy_BarCodeBillList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+ },
+ //#endregion
+
+ //#region 鎵撳嵃
+ get_PrintReport() {
+ if (this.checkDataList.length == 0) {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁");
+ } else {
+ this.rowSel = [];
+ for (var i = 0; i < this.selection.length; i++) {
+ this.rowSel.push(this.selection[i].HItemID.toString());
+ }
+ this.printListShow = true;
+ this.openPrintList = true;
+ }
+ },
+ //#endregion
+
+ //#region 閫�鍑�
+ close() {
+ // this.reset()
+ this.tableShow = true
+ this.openEdit = false
+ this.editShow = false
+ this.handleQuery()
+ },
+ //#endregion
+ }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+ width: 100%;
+}
+</style>
--
Gitblit v1.9.1