条码生成物料选择修改

陈婷婷

2025-12-18 a84c33a090d8d2d9f3d7fd9eff65736907182dd6

条码生成物料选择修改

 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;
}


 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({