From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员，保管员和验收员的对应的显示
---
src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
index 11777f4..9890146 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
@@ -8,10 +8,10 @@
</el-select>
</el-form-item>
<el-form-item label="寮�濮嬫棩鏈�">
- <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" />
+ <el-date-picker v-model="query.HBeginDate" type="date" placeholder="寮�濮嬫棩鏈�" style="width:160px" :disabled="timeCycleDisabled" value-format="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" />
+ <el-date-picker v-model="query.HEndDate" type="date" placeholder="缁撴潫鏃ユ湡" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd" />
</el-form-item>
<el-form-item label="鍗曟嵁鍙�">
<el-input v-model="query.HBillNo" style="width:160px" />
@@ -72,7 +72,7 @@
<el-col :span="6">
<el-form-item label="杩囨护">
<el-select v-model="query.ColName" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -101,7 +101,7 @@
<el-col :span="6">
<el-form-item label="杩囨护1">
<el-select v-model="query.ColName1" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -130,7 +130,7 @@
<el-col :span="6">
<el-form-item label="杩囨护2">
<el-select v-model="query.ColName2" style="width:190px">
- <el-option value="0" label=""></el-option>
+ <!-- <el-option value="0" label=""></el-option> -->
<el-option v-for="col in filterColumns" :key="col.field" :value="col.field" :label="col.title" />
</el-select>
</el-form-item>
@@ -175,7 +175,9 @@
<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>
<el-table
@@ -184,11 +186,11 @@
border
style="width:100%"
@row-click="onRowClick"
- @selection-change="onSelectionChange"
+ @selection-change="onSelectionChange"
:loading="loading"
ref="mainTable"
>
- <el-table-column type="selection" width="55" />
+ <el-table-column type="selection" width="55" />
<el-table-column v-for="(col, idx) in tableColumns" :key="idx" :prop="col.field" :label="col.title" :width="col.width" :formatter="col.formatter">
<template v-if="col.field === '鍗曟嵁鍙�'" #default="scope">
<span style="color: blue; cursor: pointer;" @click="onBillNoClick(scope.row)">{{ scope.row.鍗曟嵁鍙� }}</span>
@@ -210,6 +212,8 @@
:visible.sync="barcodeDetailVisible"
ref="barcodeDetail"
/>
+ <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
+ <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
</div>
</template>
@@ -218,22 +222,23 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldinBillList/fbStepFoldinBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
-
+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: '',
@@ -246,14 +251,14 @@
HSourceBillNo: '',
Warehouse: '',
Hmaker: '',
- ColName: '0',
- Comparator: '0',
+ ColName: '',
+ Comparator: '',
ColContent: '',
- ColName1: '0',
- Comparator1: '0',
+ ColName1: '',
+ Comparator1: '',
ColContent1: '',
- ColName2: '0',
- Comparator2: '0',
+ ColName2: '',
+ Comparator2: '',
ColContent2: ''
},
timeCycles: [
@@ -280,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() {
@@ -294,7 +299,7 @@
this.set_InitGrid();
this.ColFilter();
this.get_DefaultModule();
- },
+ },
setSelect_HInitTimeCycle() {
this.query.HInitTimeCycle = 29;
},
@@ -304,7 +309,9 @@
const cycle = this.query.HInitTimeCycle;
if (cycle === -1) {
- // 浠绘剰闂撮殧锛屼笉娓呯┖鏃ユ湡
+
+ // this.query.HBeginDate = '';
+ // this.query.HEndDate = '';
this.timeCycleDisabled = false;
return;
}
@@ -429,7 +436,7 @@
const userName = sessionStorage['HUserName'] || sessionStorage['Czybm'] || 'admin';
const orgName = sessionStorage['OrganizationName'] || sessionStorage['Organization'] || '娴欐睙鏅轰簯杩堟��';
- const url = `${this.baseURL}/Kf_StepFoldinBill/GetStepFoldinBillList`;
+ const url = `${this.$baseUrl}/Kf_StepFoldinBill/GetStepFoldinBillList`;
const params = {
sWhere: sWhere || '',
user: userName,
@@ -496,7 +503,7 @@
},
async get_DefaultModule() {
try {
- const url = `${this.baseURL}/Xt_FastICScheme/Chooselist`;
+ const url = `${this.$baseUrl}/Xt_FastICScheme/Chooselist`;
const params = {
user: sessionStorage['Czybm'] || sessionStorage['HUserName'] || '',
HModuleName: '鍒嗘寮忚皟鍏ュ崟缁存姢',
@@ -541,7 +548,7 @@
try {
await this.$confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠', '鍒犻櫎纭');
- const url = `${this.baseURL}/Fb_StepFoldInBill/DeltetFb_StepFoldInBill`;
+ const url = `${this.$baseUrl}/Fb_StepFoldInBill/DeltetFb_StepFoldInBill`;
const params = { HInterID: (row.hmainid || row.HInterID) };
const resp = await axios.get(url, { params });
@@ -570,7 +577,7 @@
try {
await this.$confirm(`纭瑕�${actionName}姝ゅ崟鎹悧锛焋, `${actionName}纭`);
- const url = `${this.baseURL}/Kf_StepFoldInBill/AuditKf_StepFoldInBill`;
+ const url = `${this.$baseUrl}/Kf_StepFoldInBill/AuditKf_StepFoldInBill`;
const params = {
HInterID: (row.hmainid || row.HInterID),
Type: type,
@@ -603,7 +610,7 @@
try {
await this.$confirm(`纭瑕�${actionName}姝ゅ崟鎹悧锛焋, `${actionName}纭`);
- const url = `${this.baseURL}/Kf_StepFoldInBill/CloseKf_StepFoldInBill`;
+ const url = `${this.$baseUrl}/Kf_StepFoldInBill/CloseKf_StepFoldInBill`;
const params = {
HInterID: (row.hmainid || row.HInterID),
Type: type,
@@ -636,7 +643,7 @@
try {
await this.$confirm(`纭瑕�${actionName}姝ゅ崟鎹悧锛焋, `${actionName}纭`);
- const url = `${this.baseURL}/Kf_StepFoldInBill/CancellKf_StepFoldInBill`;
+ const url = `${this.$baseUrl}/Kf_StepFoldInBill/CancellKf_StepFoldInBill`;
const params = {
HInterID: (row.hmainid || row.HInterID),
Type: type,
@@ -665,10 +672,26 @@
},
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 id = row.hmainid || row.HInterID;
- window.open('./Fb_StepFoldinBillEdit.html?OperationType=3&linterid=' + id, '_blank');
+ const table = this.$refs.mainTable;
+ if (table) {
+ try {
+ table.clearSelection();
+ table.toggleRowSelection(row, true);
+ } catch (e) {
+ if (table.setCurrentRow) table.setCurrentRow(row);
+ }
+ }
+ this.selectedRows = [row];
+ this.operationType = '3';
+ this.currentId = row.hmainid || row.HInterID || row.HItemID || '';
+ this.editDialogVisible = true;
},
get_BarCodeDetail() {
if (this.selectedRows.length !== 1) {
@@ -696,6 +719,18 @@
const hmainid = this.selectedRows.map(r => (r.hmainid * (10 ** 8)) + (r.hsubid || 0)).toString();
window.open('../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid + '&MyMsg=' + hmainid + '&Type=HSeOutStockBillList', '_blank');
},
+ //#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_Refresh() {
this.onReset();
},
--
Gitblit v1.9.1