From cfd0b53967daca92d98cd304e4d4e0577e2efbd3 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 13 一月 2026 13:27:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index e77308f..34e273a 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -8,7 +8,7 @@
</el-select>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�">
- <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
+ <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
</el-form-item>
<el-form-item label="缁撴潫鏃ユ湡">
<el-date-picker v-model="query.HEndDate" type="date" placeholder="缁撴潫鏃ユ湡" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -175,6 +175,7 @@
<el-button size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
<el-button size="mini" @click="get_Refresh">鍒锋柊</el-button>
<el-button size="mini" @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
+ <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
</el-col>
</el-row>
@@ -210,7 +211,7 @@
:visible.sync="barcodeDetailVisible"
ref="barcodeDetail"
/>
-
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</template>
@@ -220,23 +221,24 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
-
+import dayjs from 'dayjs';
+import PackStockDetail from '@/views/component/PackStockDetail'
export default {
name: 'FbStepFoldinBillList',
components: {
FbStepFoldinBillEdit,
- BarCodeDetail
+ BarCodeDetail,PackStockDetail
},
data() {
return {
-
+ rowForm: {},
editDialogVisible:false,
operationType:'1',
currentId : '',
barcodeDetailVisible: false,// 鏉＄爜鏄庣粏寮圭獥鏄剧ず鎺у埗
-
+ packStockDetailShow:false,
query: {
HInitTimeCycle: 29,
HBeginDate: '',
@@ -283,7 +285,7 @@
selectedRows: [],
currentFilterName: '',
activeCollapse: [],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API,
};
},
created() {
@@ -322,6 +324,7 @@
const yyyy = d.getFullYear();
const mm = String(d.getMonth() + 1).padStart(2, '0');
const dd = String(d.getDate()).padStart(2, '0');
+
return `${yyyy}-${mm}-${dd}`;
},
onTimeCycleChange() {
@@ -392,8 +395,8 @@
if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
- if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${q.HBeginDate}'`);
- if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${q.HEndDate}'`);
+ if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
+ if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),鏃ユ湡, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
if (q.HBillNo) sWhereParts.push(` and 鍗曟嵁鍙� like '%${q.HBillNo}%'`);
if (q.HDeptID) sWhereParts.push(` and 閮ㄩ棬 like '%${q.HDeptID}%'`);
if (q.MaterialCode) sWhereParts.push(` and 鐗╂枡浠ｇ爜 like '%${q.MaterialCode}%'`);
@@ -668,6 +671,10 @@
},
onSelectionChange(selection) {
this.selectedRows = selection;
+ this.ids = selection.map(item => item.hmainid)
+ console.log('閫夋嫨鐨勮:', selection,"閫夋嫨鐨刬ds:",this.ids);
+ if (selection.length > 0)
+ this.rowForm = selection[0]
},
onBillNoClick(row) {
const table = this.$refs.mainTable;
@@ -689,11 +696,24 @@
this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
return
}
+
this.barcodeDetailVisible = true
this.$nextTick(() => {
this.$refs.barcodeDetail.open(this.selectedRows[0])
})
},
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
get_ViewReport() {
if (this.selectedRows.length !== 1) {
this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹墦鍗帮紒');
--
Gitblit v1.9.1