From 86d627eecb14597a338ee402eab5a0c05ce1bdeb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 27 十一月 2025 08:26:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyWarehouse/gyWarehouse.vue | 562 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 382 insertions(+), 180 deletions(-)
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 2382b69..89904cf 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,106 +1,199 @@
<template>
- <div style="padding: 10px; position: relative;">
- <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+ <div style="padding: 10px; position: relative">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ label-width="98px"
+ :inline="true"
+ class="searchBox"
+ >
<el-row>
<el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
- <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HNumber"
+ placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" prop="HName">
- <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" @keyup.enter.native="handleQuery"
- class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.HName"
+ placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgName" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID.toString()"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍚屾" :inline="true">
- <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleSync">
+ <el-input
+ v-model="queryParams.HSyncNumber"
+ placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+ @keyup.enter.native="handleSync"
+ >
<el-button slot="append" type="primary" @click="handleSync">鍚屾</el-button>
</el-input>
</el-form-item>
</el-row>
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
- 鎼� 绱�</el-button>
- <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false">鍙� 娑�</el-button>
+ 鎼� 绱�</el-button
+ >
+ <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
+ >鍙� 娑�</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-form-item label-width="0">
- <el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <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"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <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"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in comparatorList" :key="index">
- <el-option :label="item.label" :value="item.value" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <el-select
+ v-model="queryParams.ColName"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <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" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
- </el-row>
- </el-form-item>
+ </el-form-item>
+ </el-row>
</div>
</el-card>
</el-collapse-item>
@@ -109,119 +202,229 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">瀵煎叆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleImport"
+ >瀵煎叆</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
- id="btn-Add">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ >缂栬緫</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ <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-edit" size="mini" :disabled="single"
- @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(0, (form = rowForm))"
+ >瀹℃牳</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))">杩斿鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >杩斿鏍�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(0, (form = rowForm))"
+ >绂佺敤</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_De_Stop(1, (form = rowForm))"
+ >鍙嶇鐢�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <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-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
<el-col :span="1.5" class="zy-hidden">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+ >鎼� 绱�</el-button
+ >
</el-col>
<el-col :span="1.5" class="zy-hidden">
- <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :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.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
+ <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.sorderid"
+ 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
- >
+ <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" :pageSizes="pageSizes"
- @pagination="getList" />
- <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
- </el-dialog>
- <!-- 缂栬緫 -->
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ :pageSizes="pageSizes"
+ @pagination="getList"
+ />
<el-dialog
- title="缂栬緫浠撳簱"
- :visible.sync="openEdit"
- width="1480px"
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
append-to-body
- class="xsckdBox"
- :before-close="close"
- @close="editBeforeCloseHandle"
>
- <edit
- :OperationType="OperationType"
- :linterid="this.rowForm.HItemID"
- :HSouceBillType="this.rowForm.HSourceBillType"
- :copyType="copyType"
- @editCloseGy="editGyClose"
- v-if="editShow"
- ref="editRef"
+ <RowSettings
+ :colName="btResList"
+ :HModName="HModName"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
/>
</el-dialog>
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+ <!-- 缂栬緫 -->
+ <el-dialog title="缂栬緫浠撳簱" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+ :before-close="close" @close="editBeforeCloseHandle">
+ <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
+ :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow"
+ ref="editRef" />
+ </el-dialog>
+ <el-dialog
+ :title="upload.title"
+ :visible.sync="upload.open"
+ width="1500px"
+ append-to-body
+ >
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @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-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">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
- height="550">
+ <el-table
+ :data="uploadData"
+ v-loading="uploadTableLoading"
+ :row-class-name="uploadDataIndex"
+ border
+ height="550"
+ >
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="浠撳簱浠ｇ爜" align="center" width="120" />
<el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
@@ -231,13 +434,24 @@
<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.row)">鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes" @pagination="currentPage" />
+ <pagination
+ v-show="uploadTotal > 0"
+ :total="uploadTotal"
+ :page.sync="uploadPage"
+ :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes"
+ @pagination="currentPage"
+ />
</el-dialog>
</div>
</div>
@@ -260,7 +474,7 @@
editRef: null,
activeSeach: "",
HModName: "Gy_Warehouse",
- activeSeach: '',
+ activeSeach: "",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -313,12 +527,11 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -337,7 +550,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -400,7 +613,7 @@
};
},
created() {
- this.getList();
+ this.handleQuery();
this.riqiChange();
},
methods: {
@@ -539,33 +752,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- }
- this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -579,7 +765,7 @@
.get(this.baseURL + "/Gy_WareHouse/listpage", {
params: {
sWhere: `${this.sWhere}`,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: "娴欐睙鏅轰簯杩堟��",
page: this.page,
size: this.pageSize,
@@ -669,7 +855,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -825,14 +1016,14 @@
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
- if (this.checkIsIframe) {
+ if (this.checkIsIframe()) {
// 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
window.selectedRow = row;
}
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
if (this.openPage) {
- this.$emit('deptEmit', row, 2)
+ this.$emit("deptEmit", row, 2);
}
},
//閫変腑琛岄珮浜牱寮�
@@ -849,17 +1040,16 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- // if (this.checkIsIframe) {
- // // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
- // window.parent.iframeWareHouseCallBack(row);
- // return;
- // }
this.OperationType = 3;
if (this.openPage) {
- this.$emit('deptEmitDb', row, 2)
- }
- else {
- this.handleEdit();
+ this.$emit("deptEmitDb", row, 2);
+ } else {
+ if (this.checkIsIframe) {
+ // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ window.parent.iframeWareHouseCallBack(row);
+ return;
+ }
+ this.handleEdit();
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -868,21 +1058,19 @@
if (this.openPage) {
//鍒楄〃鍗曢��
if (selection.length > 1) {
- const del_row = selection.shift()
- this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
- this.rowForm = {}
- this.ids = selection.map(item => item.HItemID)
- this.rowForm = selection[0]
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
+ this.rowForm = selection[0];
} else {
- //澶氶��
this.ids = selection.map((item) => item.HItemID);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
this.rowForm = selection[0];
}
- }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -968,8 +1156,10 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+ if (this.queryParams.HOrgID) {
+ let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
+ this.sWhere += " and 缁勭粐鍚嶇О = '" + OrgName + "'";
}
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
@@ -994,7 +1184,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1076,7 +1266,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "/DeltetGy_Warehouse", {
- params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1093,7 +1286,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => { });
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
@@ -1101,7 +1294,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
- params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsAudit: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1122,7 +1319,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((response) => {
let result = response.data;
@@ -1169,8 +1370,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 }
);
@@ -1188,7 +1389,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
@@ -1199,8 +1400,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 }
);
@@ -1224,7 +1425,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => { });
+ .catch(() => {});
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1239,6 +1440,7 @@
this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
}, 100);
},
+ },
};
</script>
<style>
@@ -1246,7 +1448,7 @@
width: 100%;
}
-.form-item-inline>.el-form-item__content {
+.form-item-inline > .el-form-item__content {
display: flex;
flex-direction: row;
}
--
Gitblit v1.9.1