From a84c33a090d8d2d9f3d7fd9eff65736907182dd6 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 18 十二月 2025 09:42:46 +0800
Subject: [PATCH] 条码生成物料选择修改
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 26 ++-
src/views/gyMaterial/GyMaterial.vue | 422 +++++++++++++---------------------------------------
2 files changed, 122 insertions(+), 326 deletions(-)
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="鐗╂枡浠ｇ爜" 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 === '鐗╂枡浠ｇ爜'"
- >{{ 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 === '鐗╂枡浠ｇ爜'">{{
+ 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/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.鐗╂枡浠ｇ爜;
- 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.璁￠噺鍗曚綅浠ｇ爜
+ this.editWlxxData = []
+ for (var i = 0; i < deptRow.length; i++) {
+ this.editWlxxData.push({
+ "HMaterID": deptRow[i].HItemID,
+ "HMaterNumber": deptRow[i].鐗╂枡浠ｇ爜,
+ "HMaterName": deptRow[i].鐗╂枡鍚嶇О,
+ "HMaterModel": deptRow[i].瑙勬牸鍨嬪彿,
+ "HUnitID": deptRow[i].HUnitID,
+ "HUnitNumber": deptRow[i].璁￠噺鍗曚綅浠ｇ爜,
+ "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({
--
Gitblit v1.9.1