From 098583fc3d814c149d09f415fd2b32bca8d21972 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 03 十二月 2025 11:13:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue | 92 +++++++++++++++++++++++++++-------------------
1 files changed, 54 insertions(+), 38 deletions(-)
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index 8b6ae45..e582065 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -9,41 +9,38 @@
class="searchBox"
>
<el-row>
- <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
- <el-date-picker
- v-model="queryParams.HBeginDate"
- type="date"
- value-format="yyyy-MM-dd"
- format="yyyy-MM-dd"
- placeholder="寮�濮嬫棩鏈�"
- style="width:160px"
- :disabled="disableDataPicker"
- />
- </el-form-item>
- <el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker
- v-model="queryParams.HEndDate"
- type="date"
- value-format="yyyy-MM-dd"
- format="yyyy-MM-dd"
- placeholder="缁撴潫鏃ユ湡"
- style="width:160px"
- :disabled="disableDataPicker"
- />
- </el-form-item>
- <el-form-item label="鏃ユ湡闂撮殧">
- <el-select
- v-model="queryParams.HInitTimeCycle"
- placeholder="璇烽�夋嫨"
- @change="riqiChange"
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
+ <el-date-picker
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="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
- v-for="(item, index) in rqsgList"
- :key="index"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
+ </el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
@@ -417,6 +414,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
@@ -599,6 +599,8 @@
</el-dialog>
<!-- 鏉＄爜鏄庣粏 -->
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</div>
</template>
@@ -609,10 +611,11 @@
import Edit from '@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import dayjs from "dayjs"; //鏃ユ湡澶勭悊搴�
+import PackStockDetail from '@/views/component/PackStockDetail' //鍖呰鏄庣粏缁勪欢
export default {
name: "GySource",
- components: { RowSettings,Edit,BarCodeDetail},
+ components: { RowSettings,Edit,BarCodeDetail,PackStockDetail},
props: {
openPage: { type: String },
},
@@ -629,6 +632,7 @@
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+ packStockDetailShow:false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
HBillType: "1202",
openBtnHide: false,
btnHideShow: false,
@@ -1185,8 +1189,8 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
- return { };
+ if (this.ids.includes(row.hmainid)) {
+ return { background: "#ecf5ff" };
}
},
//鍙屽嚮琛�
@@ -1197,7 +1201,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
+ this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
@@ -1578,6 +1582,18 @@
);
}
},
+ //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
+ get_PackStockDetail() {
+ // if (this.selectedRow.length !== 1) {
+ // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+ // return
+ // }
+ this.packStockDetailShow = true
+ this.$nextTick(() => {
+ this.$refs.packStockDetail.open(this.rowForm)
+ })
+ },
+ //#endregion
// 鎻愪氦涓婁紶鏂囦欢
submitFileForm() {
this.$refs.upload.submit();
--
Gitblit v1.9.1