diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index d23bd70b..04b19185 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -459,6 +459,23 @@ export default {
       if (this.codeList.length == 0) {
         this.$modal.msgError('无新增编码绑定')
       } else {
+        const maCodeSet = new Set()
+        let hasDuplicates = false
+
+        for (const item of this.codeList) {
+          const maCode = item.maCode
+
+          if (maCodeSet.has(maCode)) {
+            hasDuplicates = true
+            break
+          }
+          maCodeSet.add(maCode)
+        }
+        console.log('codeList:', this.codeList)
+        if (hasDuplicates) {
+          this.$modal.msgError('编码绑定失败,存在重复编码，请重新输入')
+          return // 停止提交流程
+        }
         editPurchaseMacode(this.codeList).then(response => {
           console.log(this.codeList)
           if (response.data && response.data.length > 0) {
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 0a0fec87..9201f191 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -1,223 +1,181 @@
 <template>
-    <div class="app-container" id="newDevicesWarehousing">
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
+  <div class="app-container" id="newDevicesWarehousing">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="设备类型" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择设备类型"
+          clearable
+          filterable
+          style="width: 240px"
         >
-            <el-form-item label="关键字" prop="keyWord">
-                <el-input
-                    v-model="queryParams.keyWord"
-                    placeholder="请输入关键字"
-                    clearable
-                    maxlength="50"
-                    style="width: 240px"
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-            <el-form-item label="设备类型" prop="typeId">
-                <el-select
-                    v-model="queryParams.typeId"
-                    placeholder="请选择设备类型"
-                    clearable
-                    filterable
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="typeItem in typesList"
-                        :key="typeItem.typeId"
-                        :label="typeItem.typeName"
-                        :value="typeItem.typeId"
-                    />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >查询</el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
-            </el-form-item>
-        </el-form>
+          <el-option
+            v-for="typeItem in typesList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    v-hasPermi="['system:dict:export']"
-                    >导出</el-button
-                >
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-        </el-row>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:dict:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" :data="tableList">
-            <!-- <el-table-column type="selection" width="55" align="center" /> -->
-            <el-table-column
-                label="序号"
-                align="center"
-                type="index"
-                width="55px"
-            />
-            <el-table-column
-                label="采购单号"
-                align="center"
-                prop="code"
-                :show-overflow-tooltip="true"
-                width="160"
-            />
-            <el-table-column
-                label="采购日期"
-                align="center"
-                prop="purchaseTime"
-                :show-overflow-tooltip="true"
-                width="100"
-            />
-            <el-table-column
-                label="到货日期"
-                align="center"
-                prop="arrivalTime"
-                :show-overflow-tooltip="true"
-                width="100"
-            />
-            <el-table-column
-                label="采购机具设备"
-                align="center"
-                prop="purchasingTypeName"
-                :show-overflow-tooltip="true"
-                width="250"
-            />
-            <el-table-column
-                label="采购员"
-                align="center"
-                prop="purchaserName"
-                :show-overflow-tooltip="true"
-                width="100"
-            />
-            <el-table-column
-                label="入库人员"
-                align="center"
-                prop="updateBy"
-                :show-overflow-tooltip="true"
-                width="100"
-            />
-            <el-table-column
-                label="入库时间"
-                align="center"
-                prop="updateTime"
-                :show-overflow-tooltip="true"
-                width="150"
-            />
-            <el-table-column
-                label="发布时间"
-                align="center"
-                prop="createTime"
-                :show-overflow-tooltip="true"
-                width="150"
-            />
-            <el-table-column
-                label="备注"
-                align="center"
-                prop="remark"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column label="状态" align="center" prop="taskStatus">
-                <template slot-scope="scope">
-                    <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
-                    <span v-if="scope.row.taskStatus == '28'">已审核</span>
-                    <span v-if="scope.row.taskStatus == '105'">待审核</span>
-                    <span v-if="scope.row.taskStatus == '107'">已驳回</span>
-                </template>
-            </el-table-column>
+    <el-table v-loading="loading" :data="tableList">
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="序号" align="center" type="index" width="55px" />
+      <el-table-column
+        label="采购单号"
+        align="center"
+        prop="code"
+        :show-overflow-tooltip="true"
+        width="160"
+      />
+      <el-table-column
+        label="采购日期"
+        align="center"
+        prop="purchaseTime"
+        :show-overflow-tooltip="true"
+        width="100"
+      />
+      <el-table-column
+        label="到货日期"
+        align="center"
+        prop="arrivalTime"
+        :show-overflow-tooltip="true"
+        width="100"
+      />
+      <el-table-column
+        label="采购机具设备"
+        align="center"
+        prop="purchasingTypeName"
+        :show-overflow-tooltip="true"
+        width="250"
+      />
+      <el-table-column
+        label="采购员"
+        align="center"
+        prop="purchaserName"
+        :show-overflow-tooltip="true"
+        width="100"
+      />
+      <el-table-column
+        label="入库人员"
+        align="center"
+        prop="updateBy"
+        :show-overflow-tooltip="true"
+        width="100"
+      />
+      <el-table-column
+        label="入库时间"
+        align="center"
+        prop="updateTime"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+      <el-table-column
+        label="发布时间"
+        align="center"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+        width="150"
+      />
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="taskStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.taskStatus == '26'">已验收合格</span>
+          <span v-if="scope.row.taskStatus == '28'">已审核</span>
+          <span v-if="scope.row.taskStatus == '105'">待审核</span>
+          <span v-if="scope.row.taskStatus == '107'">已驳回</span>
+        </template>
+      </el-table-column>
 
-            <el-table-column
-                label="操作"
-                align="center"
-                class-name="small-padding fixed-width"
-                width="200"
-            >
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        icon="el-icon-zoom-in"
-                        @click="handleView(scope.row)"
-                        >查看</el-button
-                    >
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini" icon="el-icon-zoom-in" @click="handleView(scope.row)">查看</el-button>
 
-                    <el-button
-                        size="mini"
-                        type="primary"
-                        icon="el-icon-edit"
-                        v-if="
+          <el-button
+            size="mini"
+            type="primary"
+            icon="el-icon-edit"
+            v-if="
                             scope.row.taskStatus == '26' ||
                             scope.row.taskStatus == '105'
                         "
-                        @click="handleUpdate(scope.row)"
-                        >审核</el-button
-                    >
-                    <el-button
-                        size="mini"
-                        type="info"
-                        icon="el-icon-edit"
-                        v-if="scope.row.taskStatus == '28'"
-                        @click="handlePrint(scope.row)"
-                        >入库单</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+            @click="handleUpdate(scope.row)"
+          >审核</el-button>
+          <el-button
+            size="mini"
+            type="info"
+            icon="el-icon-edit"
+            v-if="scope.row.taskStatus == '28'"
+            @click="handlePrint(scope.row)"
+          >入库单</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
 
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-        />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-        <!--审批对话框 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="open"
-            width="1000px"
-            append-to-body
-        >
-            <el-form
-                :model="query"
-                ref="query"
-                size="small"
-                :inline="true"
-                v-show="showSearch"
-                label-width="68px"
-            >
-                <el-form-item label="关键字" prop="dictName">
-                    <el-input
-                        v-model="query.dictName"
-                        placeholder="请输入关键字"
-                        clearable
-                        maxlength="50"
-                        style="width: 240px"
-                        @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
+    <!--审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form
+        :model="query"
+        ref="query"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="关键字" prop="dictName">
+          <el-input
+            v-model="query.dictName"
+            placeholder="请输入关键字"
+            clearable
+            maxlength="50"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
@@ -226,22 +184,10 @@
       </el-form>
       <el-row :gutter="10" class="mb8" v-if="showHandle">
         <el-col :span="1.5">
-          <el-button
-            type="primary"
-            plain
-            size="mini"
-            :disabled="multiple"
-            @click="passAll"
-          >批量通过</el-button>
+          <el-button type="primary" plain size="mini" :disabled="multiple" @click="passAll">批量通过</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button
-            type="danger"
-            plain
-            size="mini"
-            @click="refusedAll"
-            :disabled="multiple"
-          >批量不通过</el-button>
+          <el-button type="danger" plain size="mini" @click="refusedAll" :disabled="multiple">批量不通过</el-button>
         </el-col>
         <!--        <el-col :span="1.5">-->
         <!--          <el-button-->
@@ -254,13 +200,29 @@
         <!--          >导出</el-button>-->
         <!--        </el-col>-->
       </el-row>
-      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
-        <el-table-column type="selection" width="55" align="center"  :selectable="selectable"/>
+      <el-table
+        v-loading="loading"
+        :data="detailTableList"
+        @selection-change="handleSelectionChange"
+        height="400"
+      >
+        <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
         <el-table-column label="序号" align="center" type="index" />
         <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="specificationType"
+          :show-overflow-tooltip="true"
+        />
         <el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" width="200"/>
+        <el-table-column
+          label="编号"
+          align="center"
+          prop="maCode"
+          :show-overflow-tooltip="true"
+          width="200"
+        />
         <el-table-column label="管理模式" align="center" prop="manageType">
           <template slot-scope="scope">
             <span v-if="scope.row.manageType=='0'">编码管理</span>
@@ -276,537 +238,500 @@
           </template>
         </el-table-column>
 
-                <el-table-column
-                    label="操作"
-                    align="center"
-                    class-name="small-padding fixed-width"
-                    v-if="showHandle"
-                    width="150"
-                >
-                    <template
-                        slot-scope="scope"
-                        v-if="
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+          v-if="showHandle"
+          width="150"
+        >
+          <template
+            slot-scope="scope"
+            v-if="
                             scope.row.manageType == '1' ||
                             (scope.row.manageType == '0' && scope.row.maCode)
                         "
-                    >
-                        <el-button
-                            size="mini"
-                            type="text"
-                            v-if="scope.row.status == '0'"
-                            @click="pass(scope.row)"
-                            >通过</el-button
-                        >
-                        <el-button
-                            size="mini"
-                            type="text"
-                            v-if="scope.row.status == '0'"
-                            @click="refused(scope.row)"
-                            >不通过</el-button
-                        >
-                    </template>
-                </el-table-column>
-            </el-table>
+          >
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status == '0'"
+              @click="pass(scope.row)"
+            >通过</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              v-if="scope.row.status == '0'"
+              @click="refused(scope.row)"
+            >不通过</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
 
-            <pagination
-                v-show="dialogTotal > 0"
-                :total="dialogTotal"
-                :page.sync="query.pageNum"
-                :limit.sync="query.pageSize"
-                @pagination="getDialogTable"
-            />
-        </el-dialog>
+      <pagination
+        v-show="dialogTotal > 0"
+        :total="dialogTotal"
+        :page.sync="query.pageNum"
+        :limit.sync="query.pageSize"
+        @pagination="getDialogTable"
+      />
+    </el-dialog>
 
-        <!-- 入库单弹窗 -->
-        <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
-            <div style="height: 600px; overflow-y: scroll">
-                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-                    <div
-                        class="title"
-                        style="
+    <!-- 入库单弹窗 -->
+    <el-dialog :visible.sync="openPrint" width="900px" append-to-body>
+      <div style="height: 600px; overflow-y: scroll">
+        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+          <div
+            class="title"
+            style="
                             text-align: center;
                             font-weight: 600;
                             font-size: 16px;
                         "
-                    >
-                        入库单
-                    </div>
-                    <div
-                        class="info"
-                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
-                    >
-                        <div
-                            class="item"
-                            style="
+          >入库单</div>
+          <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
+            <div
+              class="item"
+              style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
                             "
-                        >
-                            <span>工程名称：</span>
-                        </div>
-                        <div
-                            class="item"
-                            style="
+            >
+              <span>工程名称：</span>
+            </div>
+            <div
+              class="item"
+              style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
                             "
-                        >
-                            <span>日期：</span>
-                        </div>
-                        <div
-                            class="item"
-                            style="
+            >
+              <span>日期：</span>
+            </div>
+            <div
+              class="item"
+              style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
                             "
-                        >
-                            <span>领料单号</span>
-                        </div>
-                        <div
-                            class="item"
-                            style="
+            >
+              <span>领料单号</span>
+            </div>
+            <div
+              class="item"
+              style="
                                 width: 50%;
                                 flex-shrink: 0;
                                 margin-bottom: 5px;
                                 font-size: 14px;
                             "
-                        >
-                            <span>车辆信息：</span>
-                        </div>
-                    </div>
-                    <el-table
-                        :data="printTableData"
-                        class="table"
-                        style="
+            >
+              <span>车辆信息：</span>
+            </div>
+          </div>
+          <el-table
+            :data="printTableData"
+            class="table"
+            style="
                             margin-top: 20px;
                             padding-bottom: 1px;
                             padding-right: 1px;
                         "
-                        border
-                    >
-                        <!--          <el-table-column type="selection" width="55" align="center" />-->
-                        <el-table-column
-                            label="序号"
-                            align="center"
-                            type="index"
-                        />
-                        <el-table-column
-                            label="类型名称"
-                            align="center"
-                            prop="typeName"
-                        />
-                        <el-table-column
-                            label="规格型号"
-                            align="center"
-                            prop="specificationType"
-                        />
-                        <el-table-column
-                            label="计量单位"
-                            align="center"
-                            prop="unitName"
-                        />
-                        <el-table-column
-                            label="数量"
-                            align="center"
-                            prop="checkNum"
-                        />
-                        <el-table-column
-                            label="备注"
-                            align="center"
-                            prop="remark"
-                        />
-                        <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
-                    </el-table>
+            border
+          >
+            <!--          <el-table-column type="selection" width="55" align="center" />-->
+            <el-table-column label="序号" align="center" type="index" />
+            <el-table-column label="类型名称" align="center" prop="typeName" />
+            <el-table-column label="规格型号" align="center" prop="specificationType" />
+            <el-table-column label="计量单位" align="center" prop="unitName" />
+            <el-table-column label="数量" align="center" prop="checkNum" />
+            <el-table-column label="备注" align="center" prop="remark" />
+            <!-- <el-table-column label="出库方式" align="center" prop="manageTypeName"  /> -->
+          </el-table>
 
-                    <div
-                        class="fillIn"
-                        style="
+          <div
+            class="fillIn"
+            style="
                             margin-top: 20px;
                             display: flex;
                             justify-content: space-between;
                         "
-                    >
-                        <div class="item" style="width: 25%">
-                            <span>审核：</span>
-                        </div>
-
-                        <div class="item" style="width: 25%">
-                            <span>库管员：</span>
-                        </div>
-                        <div class="item" style="width: 25%">
-                            <span>经办人：</span>
-                        </div>
-                        <div class="item" style="width: 25%">
-                            <!-- <span>经办人：</span> -->
-                        </div>
-                    </div>
-                </vue-easy-print>
+          >
+            <div class="item" style="width: 25%">
+              <span>审核：</span>
             </div>
 
-            <div slot="footer" class="dialog-footer" style="text-align: center">
-                <el-button type="primary" @click="print">打 印</el-button>
-                <el-button @click="openPrint = false">关 闭</el-button>
+            <div class="item" style="width: 25%">
+              <span>库管员：</span>
             </div>
-        </el-dialog>
-    </div>
+            <div class="item" style="width: 25%">
+              <span>经办人：</span>
+            </div>
+            <div class="item" style="width: 25%">
+              <!-- <span>经办人：</span> -->
+            </div>
+          </div>
+        </vue-easy-print>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="print">打 印</el-button>
+        <el-button @click="openPrint = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-    import { getTypeList } from '@/api/store/warehousing'
-    import {
-        getPutInList,
-        getPutinDetailsList,
-        changePutinStatus,
-        warehousingEntry,
-    } from '@/api/store/newBuy'
-    import vueEasyPrint from 'vue-easy-print'
-    export default {
-        // name: "NewDevicesWarehousing",
-        // dicts: ['sys_normal_disable'],
-        components: { vueEasyPrint },
-        data() {
-            return {
-                // 遮罩层
-                loading: true,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 总条数
-                dialogTotal: 0,
-                //搜索下拉数据
-                typesList: [],
-                modelList: [],
-                // 表格数据
-                tableList: [],
-                detailTableList: [],
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                openPrint: false,
-                printData: {},
-                printTableData: [],
-                showHandle: true,
-                // 日期范围
-                dateRange: [],
-                // 查询参数
-                queryParams: {
-                    pageNum: 1,
-                    pageSize: 10,
-                    dictName: undefined,
-                    dictType: undefined,
-                    status: undefined,
-                    keyWord: '',
-                    typeId: '',
-                },
-                query: {
-                    pageNum: 1,
-                    pageSize: 10,
-                },
-                // 表单参数
-                form: {},
-                // 表单校验
-                rules: {
-                    dictName: [
-                        {
-                            required: true,
-                            message: '字典名称不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    dictType: [
-                        {
-                            required: true,
-                            message: '字典类型不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                },
-            }
-        },
-        created() {
-            this.getTypeList()
-            this.getList()
-        },
-        methods: {
-            getTypeList() {
-                getTypeList({ level: '3' }).then((response) => {
-                    this.typesList = response.data
-                })
-            },
-            /** 查询字典类型列表 */
-            getList() {
-                this.loading = true
-                getPutInList(this.queryParams).then((response) => {
-                    this.tableList = response.rows
-                    this.total = response.total
-                    this.loading = false
-                })
-            },
-
-            getDialogTable() {
-                this.loading = true
-                getPutinDetailsList(this.query).then((response) => {
-                    this.detailTableList = response.rows
-                    this.dialogTotal = response.total
-                    this.loading = false
-                })
-            },
-
-            // 取消按钮
-            cancel() {
-                this.open = false
-                this.reset()
-            },
-            // 表单重置
-            reset() {
-                this.form = {
-                    dictId: undefined,
-                    dictName: undefined,
-                    dictType: undefined,
-                    status: '0',
-                    remark: undefined,
-                }
-                this.resetForm('form')
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1
-                this.getList()
-            },
-            /** 搜索按钮操作 */
-            handleDialogQuery() {
-                this.query.pageNum = 1
-                this.getDialogTable()
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.resetForm('queryForm')
-                this.handleQuery()
-            },
-            //是否可用勾选框
-            selectable(row) {
-                console.log(row)
-                if (row.status == '0') {
-                    if (
-                        (row.manageType == '0' && row.maCode) ||
-                        row.manageType == '1'
-                    ) {
-                        return true
-                    } else {
-                        return false
-                    }
-                } else {
-                    return false
-                }
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map((item) => item)
-                this.single = selection.length != 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                // this.reset();
-                this.query.taskId = row.taskId
-                this.getDialogTable()
-                this.open = true
-                this.showHandle = true
-                this.title = '审核'
-            },
-
-            //通过
-            pass(row) {
-                console.log(row)
-                console.log(this.query.taskId)
-                row.taskId = this.query.taskId
-                let obj = {
-                    taskId: this.query.taskId,
-                    maId: row.maId,
-                    inputNum: row.checkNum,
-                    maCode: row.maCode,
-                    typeId: row.typeId,
-                }
-
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '1',
-                    inputRecordList: [obj],
-                }
-                changePutinStatus(param).then((response) => {
-                    if (response.code == 200) {
-                        this.$modal.msgSuccess('审批成功')
-                        this.getDialogTable()
-                        this.getList()
-                    } else {
-                        this.$modal.msgSuccess('审批失败')
-                    }
-                })
-            },
-            passAll() {
-                console.log(this.query.taskId)
-                console.log(this.ids)
-                this.ids.forEach((item) => {
-                    item.taskId = this.query.taskId
-                    item.typeId = item.typeId
-                    item.maId = item.maId
-                    item.inputNum = item.checkNum
-                    item.maCode = item.maCode
-                })
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '1',
-                    inputRecordList: this.ids,
-                }
-                changePutinStatus(param).then((response) => {
-                    if (response.code == 200) {
-                        this.$modal.msgSuccess('审批成功')
-                        this.getDialogTable()
-                        this.getList()
-                    } else {
-                        this.$modal.msgSuccess('审批失败')
-                    }
-                })
-            },
-            //拒绝
-            refused(row) {
-                console.log(row)
-                console.log(this.query.taskId)
-                row.taskId = this.query.taskId
-                let obj = {
-                    taskId: this.query.taskId,
-                    maId: row.maId,
-                    maCode: row.maCode,
-                    inputNum: row.checkNum,
-                    typeId: row.typeId,
-                }
-
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '2',
-                    inputRecordList: [obj],
-                }
-                changePutinStatus(param).then((response) => {
-                    if (response.code == 200) {
-                        this.$modal.msgSuccess('审批成功')
-                        this.getDialogTable()
-                        this.getList()
-                    } else {
-                        this.$modal.msgSuccess('审批失败')
-                    }
-                })
-            },
-            refusedAll() {
-                console.log(this.query.taskId)
-                console.log(this.ids)
-                this.ids.forEach((item) => {
-                    item.taskId = this.query.taskId
-                    item.typeId = item.typeId
-                    item.maId = item.maId
-                    item.inputNum = item.checkNum
-                    item.maCode = item.maCode
-                })
-                let param = {
-                    taskId: this.query.taskId,
-                    checkResult: '2',
-                    inputRecordList: this.ids,
-                }
-
-                changePutinStatus(param).then((response) => {
-                    if (response.code == 200) {
-                        this.$modal.msgSuccess('审批成功')
-                        this.getDialogTable()
-                        this.getList()
-                    } else {
-                        this.$modal.msgSuccess('审批失败')
-                    }
-                })
-            },
-            //查看操作
-            handleView(row) {
-                this.query.taskId = row.taskId
-                this.getDialogTable()
-                this.open = true
-                this.showHandle = false
-                this.title = '查看'
-            },
-            //获取入库单数据
-            getPrintTable(taskId) {
-                warehousingEntry({ taskId: taskId }).then((response) => {
-                    this.printTableData = response.data
-                    // this.dialogTotal = response.total;
-                })
-            },
-            //查看入库单
-            handlePrint(row) {
-                this.query.taskId = row.taskId
-                this.getPrintTable(row.taskId)
-                this.openPrint = true
-                this.title = '入库单'
-            },
-            //打印
-            print() {
-                this.$refs.remarksPrintRef.print()
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                this.download(
-                    'material/purchaseCheckInfo/putInExport',
-                    {
-                        ...this.queryParams,
-                    },
-                    `新购工机具入库_${new Date().getTime()}.xlsx`,
-                )
-            },
-        },
+import { getTypeList } from '@/api/store/warehousing'
+import { getPutInList, getPutinDetailsList, changePutinStatus, warehousingEntry } from '@/api/store/newBuy'
+import vueEasyPrint from 'vue-easy-print'
+export default {
+  // name: "NewDevicesWarehousing",
+  // dicts: ['sys_normal_disable'],
+  components: { vueEasyPrint },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 总条数
+      dialogTotal: 0,
+      //搜索下拉数据
+      typesList: [],
+      modelList: [],
+      // 表格数据
+      tableList: [],
+      detailTableList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      openPrint: false,
+      printData: {},
+      printTableData: [],
+      showHandle: true,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+        dictType: undefined,
+        status: undefined,
+        keyWord: '',
+        typeId: '',
+      },
+      query: {
+        pageNum: 1,
+        pageSize: 10,
+        dictName: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        dictName: [
+          {
+            required: true,
+            message: '字典名称不能为空',
+            trigger: 'blur',
+          },
+        ],
+        dictType: [
+          {
+            required: true,
+            message: '字典类型不能为空',
+            trigger: 'blur',
+          },
+        ],
+      },
     }
+  },
+  created() {
+    this.getTypeList()
+    this.getList()
+  },
+  methods: {
+    getTypeList() {
+      getTypeList({ level: '3' }).then(response => {
+        this.typesList = response.data
+      })
+    },
+    /** 查询字典类型列表 */
+    getList() {
+      this.loading = true
+      getPutInList(this.queryParams).then(response => {
+        this.tableList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+
+    getDialogTable() {
+      this.loading = true
+      getPutinDetailsList(this.query).then(response => {
+        this.detailTableList = response.rows
+        this.dialogTotal = response.total
+        this.loading = false
+      })
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        dictId: undefined,
+        dictName: undefined,
+        dictType: undefined,
+        status: '0',
+        remark: undefined,
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 搜索按钮操作 */
+    handleDialogQuery() {
+      this.query.pageNum = 1
+      this.getDialogTable()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    //是否可用勾选框
+    selectable(row) {
+      console.log(row)
+      if (row.status == '0') {
+        if ((row.manageType == '0' && row.maCode) || row.manageType == '1') {
+          return true
+        } else {
+          return false
+        }
+      } else {
+        return false
+      }
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      // this.reset();
+      this.query.taskId = row.taskId
+      this.query.dictName = undefined
+      this.getDialogTable()
+      this.open = true
+      this.showHandle = true
+      this.title = '审核'
+    },
+
+    //通过
+    pass(row) {
+      console.log(row)
+      console.log(this.query.taskId)
+      row.taskId = this.query.taskId
+      let obj = {
+        taskId: this.query.taskId,
+        maId: row.maId,
+        inputNum: row.checkNum,
+        maCode: row.maCode,
+        typeId: row.typeId,
+      }
+
+      let param = {
+        taskId: this.query.taskId,
+        checkResult: '1',
+        inputRecordList: [obj],
+      }
+      changePutinStatus(param).then(response => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess('审批成功')
+          this.getDialogTable()
+          this.getList()
+        } else {
+          this.$modal.msgSuccess('审批失败')
+        }
+      })
+    },
+    passAll() {
+      console.log(this.query.taskId)
+      console.log(this.ids)
+      this.ids.forEach(item => {
+        item.taskId = this.query.taskId
+        item.typeId = item.typeId
+        item.maId = item.maId
+        item.inputNum = item.checkNum
+        item.maCode = item.maCode
+      })
+      let param = {
+        taskId: this.query.taskId,
+        checkResult: '1',
+        inputRecordList: this.ids,
+      }
+      changePutinStatus(param).then(response => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess('审批成功')
+          this.getDialogTable()
+          this.getList()
+        } else {
+          this.$modal.msgSuccess('审批失败')
+        }
+      })
+    },
+    //拒绝
+    refused(row) {
+      console.log(row)
+      console.log(this.query.taskId)
+      row.taskId = this.query.taskId
+      let obj = {
+        taskId: this.query.taskId,
+        maId: row.maId,
+        maCode: row.maCode,
+        inputNum: row.checkNum,
+        typeId: row.typeId,
+      }
+
+      let param = {
+        taskId: this.query.taskId,
+        checkResult: '2',
+        inputRecordList: [obj],
+      }
+      changePutinStatus(param).then(response => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess('审批成功')
+          this.getDialogTable()
+          this.getList()
+        } else {
+          this.$modal.msgSuccess('审批失败')
+        }
+      })
+    },
+    refusedAll() {
+      console.log(this.query.taskId)
+      console.log(this.ids)
+      this.ids.forEach(item => {
+        item.taskId = this.query.taskId
+        item.typeId = item.typeId
+        item.maId = item.maId
+        item.inputNum = item.checkNum
+        item.maCode = item.maCode
+      })
+      let param = {
+        taskId: this.query.taskId,
+        checkResult: '2',
+        inputRecordList: this.ids,
+      }
+
+      changePutinStatus(param).then(response => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess('审批成功')
+          this.getDialogTable()
+          this.getList()
+        } else {
+          this.$modal.msgSuccess('审批失败')
+        }
+      })
+    },
+    //查看操作
+    handleView(row) {
+      this.query.taskId = row.taskId
+      this.getDialogTable()
+      this.open = true
+      this.showHandle = false
+      this.title = '查看'
+    },
+    //获取入库单数据
+    getPrintTable(taskId) {
+      warehousingEntry({ taskId: taskId }).then(response => {
+        this.printTableData = response.data
+        // this.dialogTotal = response.total;
+      })
+    },
+    //查看入库单
+    handlePrint(row) {
+      this.query.taskId = row.taskId
+      this.getPrintTable(row.taskId)
+      this.openPrint = true
+      this.title = '入库单'
+    },
+    //打印
+    print() {
+      this.$refs.remarksPrintRef.print()
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        'material/purchaseCheckInfo/putInExport',
+        {
+          ...this.queryParams,
+        },
+        `新购工机具入库_${new Date().getTime()}.xlsx`
+      )
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
-    .print {
-        width: 90%;
-        padding-left: 5%;
-        padding-right: 1%;
+.print {
+  width: 90%;
+  padding-left: 5%;
+  padding-right: 1%;
 
-        .title {
-            text-align: center;
-            font-weight: 600;
-            font-size: 16px;
-        }
-        .info {
-            margin-top: 10px;
-            display: flex;
-            flex-wrap: wrap;
+  .title {
+    text-align: center;
+    font-weight: 600;
+    font-size: 16px;
+  }
+  .info {
+    margin-top: 10px;
+    display: flex;
+    flex-wrap: wrap;
 
-            .item {
-                width: 50%;
-                flex-shrink: 0;
-                margin-bottom: 5px;
-                font-size: 14px;
-            }
-        }
-
-        .fillIn {
-            margin-top: 15px;
-            display: flex;
-            justify-content: space-between;
-        }
-    }
-    ::v-deep.el-table .fixed-width .el-button--mini {
-        width: 60px !important;
-        margin-bottom: 10px;
+    .item {
+      width: 50%;
+      flex-shrink: 0;
+      margin-bottom: 5px;
+      font-size: 14px;
     }
+  }
+
+  .fillIn {
+    margin-top: 15px;
+    display: flex;
+    justify-content: space-between;
+  }
+}
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
 </style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index df69fa1a..750c4ea9 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -43,9 +43,9 @@ module.exports = {
         // target: `https://z.csgmall.com.cn`,
 
         // target: `http://10.40.92.8:8080`, //超
-        // target: `http://10.40.92.253:8080`,//韩
+        target: `http://10.40.92.81:8080`, //韩
         // target: `http://10.40.92.209:8080`,//川/
-        target: `http://10.40.92.153:8080`, //帅
+        // target: `http://10.40.92.153:8080`, //帅
         // target: `http://10.40.92.14:8080`, //福
 
         //******** 注意事项  ********* */