From dd43a7fa97659beeddecec49fcc227b823f81cc3 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 15:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../return/apply/component/home1.vue          |    1 +
 .../newAccessory/newAccessoryAccept.vue       | 1415 +++++++++--------
 .../newBuy/newDevices/newDevicesArrival.vue   | 1135 +++++++------
 src/views/store/newBuy/planAdd.vue            |  953 +++++------
 src/views/store/tools/toolsType.vue           |    4 +-
 .../machinery/coding/component/MapDIalog.vue  |  123 +-
 .../warehouseManage/machinery/type/index.vue  |    4 +-
 .../partsAcceptance/component/addParts.vue    |   13 +-
 .../toolsAcceptance/component/addTools.vue    |   19 +-
 vue.config.js                                 |    2 +-
 10 files changed, 2051 insertions(+), 1618 deletions(-)

diff --git a/src/views/claimAndreturn/return/apply/component/home1.vue b/src/views/claimAndreturn/return/apply/component/home1.vue
index 34b824c..ee94adb 100644
--- a/src/views/claimAndreturn/return/apply/component/home1.vue
+++ b/src/views/claimAndreturn/return/apply/component/home1.vue
@@ -776,6 +776,7 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.$refs.mychildSon.inputValue = ''
             this.queryParams.time = []
             this.queryParams.typeId = ''
             // this.resetForm("queryForm");
diff --git a/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue b/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
index c6c6c29..0b0c7a8 100644
--- a/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
+++ b/src/views/store/newBuy/newAccessory/newAccessoryAccept.vue
@@ -1,120 +1,140 @@
 <template>
-  <div class="app-container" id="newAccessoryAccept">
-    <el-row :gutter="24" class="mb8">
-      <el-form :model="maForm" ref="maForm" :rules="maRules" size="small" :inline="true">
-        <el-form-item label="采购日期" prop="purchaseTime">
-          <el-date-picker
-            v-model="maForm.purchaseTime"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            :disabled="isCheck||isView"
-            placeholder="请选择采购日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="arrivalTime">
-          <el-date-picker
-            v-model="maForm.arrivalTime"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            :disabled="isCheck||isView"
-            :picker-options="pickerOptions"
-            placeholder="请选择到货日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item label="采购员" prop="purchaser">
-          <el-select
-            v-model="maForm.purchaser"
-            filterable
-            placeholder="请选择采购员"
-            style="width: 100%;"
-            :disabled="isCheck||isView"
-          >
-            <el-option label="请选择" :value="0"></el-option>
-            <el-option
-              v-for="item in userList"
-              :key="item.userId"
-              :label="item.userName"
-              :value="item.userId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input
-            v-model="maForm.remark"
-            placeholder="请输入备注"
-            clearable
-            :disabled="isCheck||isView"
-            type="textarea"
-            maxlength="150"
-            style="width: 240px"
-          />
-        </el-form-item>
-      </el-form>
-    </el-row>
+    <div class="app-container" id="newAccessoryAccept">
+        <el-row :gutter="24" class="mb8">
+            <el-form
+                :model="maForm"
+                ref="maForm"
+                :rules="maRules"
+                size="small"
+                :inline="true"
+            >
+                <el-form-item label="采购日期" prop="purchaseTime">
+                    <el-date-picker
+                        v-model="maForm.purchaseTime"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        :disabled="isCheck || isView"
+                        placeholder="请选择采购日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="到货日期" prop="arrivalTime">
+                    <el-date-picker
+                        v-model="maForm.arrivalTime"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        :disabled="isCheck || isView"
+                        :picker-options="pickerOptions"
+                        placeholder="请选择到货日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="采购员" prop="purchaser">
+                    <el-select
+                        v-model="maForm.purchaser"
+                        filterable
+                        placeholder="请选择采购员"
+                        style="width: 100%"
+                        :disabled="isCheck || isView"
+                    >
+                        <el-option label="请选择" :value="0"></el-option>
+                        <el-option
+                            v-for="item in userList"
+                            :key="item.userId"
+                            :label="item.userName"
+                            :value="item.userId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input
+                        v-model="maForm.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        :disabled="isCheck || isView"
+                        type="textarea"
+                        maxlength="150"
+                        style="width: 240px"
+                    />
+                </el-form-item>
+            </el-form>
+        </el-row>
 
-    <el-form :model="addForm" ref="addForm" size="small" :inline="true" v-show="showSearch">
-      <el-row>
-        <el-form-item label="配件类型" prop="equipmentId">
-          <treeselect
-            v-model="addForm.equipmentId"
-            default-expand-all
-            :options="equipmentTypeList"
-            :disable-branch-nodes="true"
-            placeholder="请选择机具类型"
-            @select="select"
-            :disabled="isCheck||isView"
-            style="width: 240px;"
-          />
-        </el-form-item>
-        <el-form-item label="配件厂家" prop="supplierId">
-          <el-select
-            v-model="addForm.supplierId"
-            placeholder="配件厂家"
-            clearable
-            filterable
-            :disabled="isCheck||isView"
-            style="width: 240px"
-            @change="changeSupplier"
-          >
-            <el-option
-              v-for="item in supplierList"
-              :key="item.supplierId"
-              :label="item.supplier"
-              :value="item.supplierId"
-            />
-          </el-select>
-        </el-form-item>
-      </el-row>
-    </el-form>
+        <el-form
+            :model="addForm"
+            ref="addForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+        >
+            <el-row>
+                <el-form-item label="配件类型" prop="equipmentId">
+                    <treeselect
+                        v-model="addForm.equipmentId"
+                        default-expand-all
+                        :options="equipmentTypeList"
+                        :disable-branch-nodes="true"
+                        placeholder="请选择机具类型"
+                        @select="select"
+                        :disabled="isCheck || isView"
+                        style="width: 240px"
+                    />
+                </el-form-item>
+                <el-form-item label="配件厂家" prop="supplierId">
+                    <el-select
+                        v-model="addForm.supplierId"
+                        placeholder="配件厂家"
+                        clearable
+                        filterable
+                        :disabled="isCheck || isView"
+                        style="width: 240px"
+                    >
+                        <el-option
+                            v-for="item in supplierList"
+                            :key="item.supplierId"
+                            :label="item.supplier"
+                            :value="item.supplierId"
+                        />
+                    </el-select>
+                </el-form-item>
+            </el-row>
+        </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-back" size="mini" @click="jumpList">新购配件管理</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          v-if="!isView&&!isCheck"
-          @click="handleSave"
-        >保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          v-if="isCheck"
-          :disabled="multiple"
-          @click="handleListCheck"
-        >批量验收</el-button>
-      </el-col>
-      <!-- <el-col :span="1.5">
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-back"
+                    size="mini"
+                    @click="jumpList"
+                    >新购配件管理</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    v-if="!isView && !isCheck"
+                    @click="handleSave"
+                    >保存</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    v-if="isCheck"
+                    :disabled="multiple"
+                    @click="handleListCheck"
+                    >批量验收</el-button
+                >
+            </el-col>
+            <!-- <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -124,7 +144,7 @@
           @click="handleDelete" 
         >删除</el-button>
       </el-col>-->
-      <!-- <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -133,146 +153,211 @@
           @click="handleExport" 
         >导出</el-button>
       </el-col>-->
-    </el-row>
+        </el-row>
 
-    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" :selectable="selectable" />
-      <el-table-column label="序号" align="center" width="100" type="index" />
-      <el-table-column
-        label="配件名称"
-        align="center"
-        prop="machineTypeName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="配件规格"
-        align="center"
-        prop="specificationType"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="计量单位" align="center" prop="unitName" />
-      <el-table-column label="购置单价（元)" align="center" prop="purchasePrice">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.purchasePrice"
-            controls-position="right"
-            :disabled="isCheck||isView"
-            style="width: 100%;"
-            :min="0"
-          ></el-input-number>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="采购数量" align="center" prop="purchaseNum">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.purchaseNum"
-            controls-position="right"
-            :disabled="isCheck||isView"
-            style="width: 100%;"
-            :min="1"
-          ></el-input-number>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="厂家" align="center" prop="supplierId" width="200">
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.supplierId"
-            filterable
-            placeholder="厂家"
-            clearable
-            style="width: 180px"
-            :disabled="isCheck||isView"
-          >
-            <el-option
-              v-for="item in supplierList"
-              :key="item.supplierId"
-              :label="item.supplier"
-              :value="item.supplierId"
+        <el-table
+            v-loading="loading"
+            :data="equipmentList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column
+                type="selection"
+                width="55"
+                align="center"
+                :selectable="selectable"
             />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="statusResult"></el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        v-if="!isView"
-      >
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            v-if="isCheck && scope.row.status==0"
-            @click="handleCheck(scope.row)"
-          >验收</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-if="!isCheck && scope.row.status==0"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            v-if="isShow"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+            <el-table-column
+                label="序号"
+                align="center"
+                width="100"
+                type="index"
+            />
+            <el-table-column
+                label="配件名称"
+                align="center"
+                prop="machineTypeName"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column
+                label="配件规格"
+                align="center"
+                prop="specificationType"
+                :show-overflow-tooltip="true"
+            />
+            <el-table-column label="计量单位" align="center" prop="unitName" />
+            <el-table-column
+                label="购置单价（元)"
+                align="center"
+                prop="purchasePrice"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchasePrice"
+                        controls-position="right"
+                        :disabled="isCheck || isView"
+                        style="width: 100%"
+                        :min="0"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
 
-    <!-- 验收对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="配件名称:" prop="machineTypeName">
-          <el-input v-model="form.machineTypeName" disabled maxlength="50" />
-        </el-form-item>
-        <el-form-item label="配件型号" prop="specificationType">
-          <el-input v-model="form.specificationType" disabled maxlength="50" />
-        </el-form-item>
-        <el-form-item label="验收数量" prop="purchaseNum">
-          <el-input v-model="form.purchaseNum" disabled maxlength="50" />
-        </el-form-item>
-        <el-form-item label="验收结论" prop="checkResult">
-          <el-radio v-model="form.checkResult" label="通过">通过</el-radio>
-          <el-radio v-model="form.checkResult" label="不通过">不通过</el-radio>
-        </el-form-item>
-        <el-form-item label="验收通过数量" prop="checkNum">
-          <el-input-number
-            v-model="form.checkNum"
-            style="width:100%;"
-            controls-position="right"
-            :min="1"
-            :max="form.purchaseNum"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+            <el-table-column label="采购数量" align="center" prop="purchaseNum">
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchaseNum"
+                        controls-position="right"
+                        :disabled="isCheck || isView"
+                        style="width: 100%"
+                        :min="1"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
 
-    <!-- 批量验收弹窗 -->
-    <el-dialog :title="title" :visible.sync="openAll" width="650px" append-to-body>
-      <el-form ref="aform" :model="aform" :rules="arules" label-width="120px">
-        <el-form-item label="验收结论" prop="checkResult">
-          <el-radio v-model="aform.checkResult" label="通过">通过</el-radio>
-          <el-radio v-model="aform.checkResult" label="不通过">不通过</el-radio>
-        </el-form-item>
-        <!-- <el-form-item label="验收图片" prop="checkUrl">
+            <el-table-column
+                label="厂家"
+                align="center"
+                prop="supplierId"
+                width="200"
+            >
+                <template slot-scope="scope">
+                    <el-select
+                        v-model="scope.row.supplierId"
+                        filterable
+                        placeholder="厂家"
+                        clearable
+                        style="width: 180px"
+                        :disabled="isCheck || isView"
+                    >
+                        <el-option
+                            v-for="item in supplierList"
+                            :key="item.supplierId"
+                            :label="item.supplier"
+                            :value="item.supplierId"
+                        />
+                    </el-select>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="状态"
+                align="center"
+                prop="statusResult"
+            ></el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+                v-if="!isView"
+            >
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        v-if="isCheck && scope.row.status == 0"
+                        @click="handleCheck(scope.row)"
+                        >验收</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        v-if="!isCheck && scope.row.status == 0"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        v-if="isShow"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 验收对话框 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="500px"
+            append-to-body
+            :close-on-click-modal="false"
+        >
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="120px"
+            >
+                <el-form-item label="配件名称:" prop="machineTypeName">
+                    <el-input
+                        v-model="form.machineTypeName"
+                        disabled
+                        maxlength="50"
+                    />
+                </el-form-item>
+                <el-form-item label="配件型号" prop="specificationType">
+                    <el-input
+                        v-model="form.specificationType"
+                        disabled
+                        maxlength="50"
+                    />
+                </el-form-item>
+                <el-form-item label="验收数量" prop="purchaseNum">
+                    <el-input
+                        v-model="form.purchaseNum"
+                        disabled
+                        maxlength="50"
+                    />
+                </el-form-item>
+                <el-form-item label="验收结论" prop="checkResult">
+                    <el-radio v-model="form.checkResult" label="通过"
+                        >通过</el-radio
+                    >
+                    <el-radio v-model="form.checkResult" label="不通过"
+                        >不通过</el-radio
+                    >
+                </el-form-item>
+                <el-form-item label="验收通过数量" prop="checkNum">
+                    <el-input-number
+                        v-model="form.checkNum"
+                        style="width: 100%"
+                        controls-position="right"
+                        :min="1"
+                        :max="form.purchaseNum"
+                    />
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+        <!-- 批量验收弹窗 -->
+        <el-dialog
+            :title="title"
+            :visible.sync="openAll"
+            width="650px"
+            append-to-body
+        >
+            <el-form
+                ref="aform"
+                :model="aform"
+                :rules="arules"
+                label-width="120px"
+            >
+                <el-form-item label="验收结论" prop="checkResult">
+                    <el-radio v-model="aform.checkResult" label="通过"
+                        >通过</el-radio
+                    >
+                    <el-radio v-model="aform.checkResult" label="不通过"
+                        >不通过</el-radio
+                    >
+                </el-form-item>
+                <!-- <el-form-item label="验收图片" prop="checkUrl">
           <el-upload 
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
                 action="#" 
@@ -287,417 +372,471 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
         </el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="submitListForm">确 定</el-button>
-        <el-button @click="openAll=false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            </el-form>
+            <div slot="footer" class="dialog-footer" style="text-align: center">
+                <el-button type="primary" @click="submitListForm"
+                    >确 定</el-button
+                >
+                <el-button @click="openAll = false">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
 import { getUserByRoleList } from '@/api/system/user'
 import {
-  getAccessoryTree,
-  addPurchaseAccessory,
-  getPurchaseAccessoryDetails,
-  updatePurchaseAccessory,
-  checkPurchaseAccessory,
+    getAccessoryTree,
+    addPurchaseAccessory,
+    getPurchaseAccessoryDetails,
+    updatePurchaseAccessory,
+    checkPurchaseAccessory,
 } from '@/api/store/newBuy'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
-  name: 'NewAccessoryAccept',
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 表格数据
-      equipmentList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      userList: [],
-      supplierList: [],
-      equipmentTypeList: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label',
-      },
-      taskId: '',
-      isView: false,
-      isShow: false,
-      isEdit: false,
-      isCheck: false,
-      addForm: {
-        equipmentId: undefined,
-        supplierId: '',
-      },
-      maForm: {
-        purchaseTime: '',
-        arrivalTime: '',
-        purchaser: '',
-        remark: '',
-      },
-      openAll: false,
-      // 表单参数
-      aform: {},
-      // 表单校验
-      arules: {
-        checkResult: [{ required: true, message: '验收结论不能为空', trigger: 'blur' }],
-        checkUrl: [{ required: true, message: '验收图片不能为空', trigger: 'blur' }],
-      },
+    name: 'NewAccessoryAccept',
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 表格数据
+            equipmentList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            // 日期范围
+            dateRange: [],
+            userList: [],
+            supplierList: [],
+            equipmentTypeList: [],
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            taskId: '',
+            isView: false,
+            isShow: false,
+            isEdit: false,
+            isCheck: false,
+            addForm: {
+                equipmentId: undefined,
+                supplierId: '',
+            },
+            maForm: {
+                purchaseTime: '',
+                arrivalTime: '',
+                purchaser: '',
+                remark: '',
+            },
+            openAll: false,
+            // 表单参数
+            aform: {},
+            // 表单校验
+            arules: {
+                checkResult: [
+                    {
+                        required: true,
+                        message: '验收结论不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                checkUrl: [
+                    {
+                        required: true,
+                        message: '验收图片不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
 
-      rules: {
-        checkResult: [{ required: true, message: '验收结论不能为空', trigger: 'blur' }],
-        checkNum: [{ required: true, message: '验收通过数量不能为空', trigger: 'blur' }],
-      },
-      // 表单校验
-      maRules: {
-        purchaseTime: [{ required: true, message: '采购日期不能为空', trigger: 'blur' }],
-        arrivalTime: [{ required: true, message: '到货日期不能为空', trigger: 'blur' }],
-        // purchaser: [
-        //   { required: true, message: "采购员不能为空", trigger: "blur" }
-        // ]
-      },
-    }
-  },
-  computed: {
-    pickerOptions() {
-      return {
-        disabledDate(time) {
-          const currentDate = new Date()
-          currentDate.setHours(0, 0, 0, 0)
-          return time.getTime() < currentDate.getTime()
+            rules: {
+                checkResult: [
+                    {
+                        required: true,
+                        message: '验收结论不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                checkNum: [
+                    {
+                        required: true,
+                        message: '验收通过数量不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+            },
+            // 表单校验
+            maRules: {
+                purchaseTime: [
+                    {
+                        required: true,
+                        message: '采购日期不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                arrivalTime: [
+                    {
+                        required: true,
+                        message: '到货日期不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                // purchaser: [
+                //   { required: true, message: "采购员不能为空", trigger: "blur" }
+                // ]
+            },
+        }
+    },
+    computed: {
+        pickerOptions() {
+            return {
+                disabledDate(time) {
+                    const currentDate = new Date()
+                    currentDate.setHours(0, 0, 0, 0)
+                    return time.getTime() < currentDate.getTime()
+                },
+            }
         },
-      }
     },
-  },
-  watch: {
-    'maForm.purchaseTime'() {
-      if (this.maForm.purchaseTime != '') {
-        this.maForm.arrivalTime = ''
-      }
+    watch: {
+        'maForm.purchaseTime'() {
+            if (this.maForm.purchaseTime != '') {
+                this.maForm.arrivalTime = ''
+            }
+        },
     },
-  },
-  created() {
-    const isShow = this.$route.query && this.$route.query.isShow
-    if (isShow && isShow == 'true') {
-      this.isShow = true
-    } else {
-      this.isShow = false
-    }
-    const taskId = this.$route.query && this.$route.query.taskId
-    this.taskId = taskId
-    if (this.taskId == '' || !this.taskId) {
-      this.isEdit = false
-    } else if (this.taskId != '') {
-      this.isEdit = true
-      this.getTaskInfo()
-    }
-    const isView = this.$route.query && this.$route.query.isView
-    if (isView && isView == 'true') {
-      this.isView = true
-    } else {
-      this.isView = false
-    }
-    const isCheck = this.$route.query && this.$route.query.isCheck
-    if (isCheck && isCheck == 'true') {
-      this.isCheck = true
-    } else {
-      this.isCheck = false
-    }
-
-    this.getUserList()
-    this.supplierInfoList()
-    this.getAccessoryTree()
-  },
-  methods: {
-    /** 查询用户列表--采购员 */
-    getUserList() {
-      getUserByRoleList({ roleId: '104' }).then(response => {
-        this.userList = response.data
-      })
-    },
-    /** 厂家 */
-    supplierInfoList() {
-      supplierInfoList().then(response => {
-        this.supplierList = response.rows
-      })
-    },
-    /** 配件类型 */
-    getAccessoryTree() {
-      getAccessoryTree().then(response => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children.length > 0) {
-                item2.children.forEach(item3 => {
-                  item3.machineTypeName = item2.label
-                  item3.specificationType = item3.label
-                  item3.partId = item3.id
-                  // item3.purchasePrice = 1
-                  // item3.purchaseNum = 1
-                  this.$set(item3, 'purchasePrice', 0)
-                  this.$set(item3, 'purchaseNum', 1)
-                })
-              }
-            })
-          }
-        })
-      })
-    },
-    //添加机具类型
-    select(row) {
-      console.log(row)
-      if (row.level == 3) {
-        for (let i = 0; i < this.equipmentList.length; i++) {
-          if (this.equipmentList[i].id == row.id) {
-            this.equipmentList.splice(i, 1)
-            break
-          }
+    created() {
+        const isShow = this.$route.query && this.$route.query.isShow
+        if (isShow && isShow == 'true') {
+            this.isShow = true
+        } else {
+            this.isShow = false
+        }
+        const taskId = this.$route.query && this.$route.query.taskId
+        this.taskId = taskId
+        if (this.taskId == '' || !this.taskId) {
+            this.isEdit = false
+        } else if (this.taskId != '') {
+            this.isEdit = true
+            this.getTaskInfo()
+        }
+        const isView = this.$route.query && this.$route.query.isView
+        if (isView && isView == 'true') {
+            this.isView = true
+        } else {
+            this.isView = false
+        }
+        const isCheck = this.$route.query && this.$route.query.isCheck
+        if (isCheck && isCheck == 'true') {
+            this.isCheck = true
+        } else {
+            this.isCheck = false
         }
-        this.$set(row, 'supplierId', '')
-        this.$set(row, 'purchasePrice', 0)
-        this.$set(row, 'purchaseNum', 1)
-        this.equipmentList.unshift(row)
-      }
-    },
-    //选择机具厂家
-    changeSupplier(supplierId) {
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'supplierId', supplierId)
-      })
-    },
-    /** 新增按钮操作 */
-    handleSave() {
-      if (this.equipmentList.length > 0) {
-        this.$refs['maForm'].validate(valid => {
-          if (valid) {
-            console.log(this.maForm, 'maForm')
-            console.log(this.equipmentList, 'equipmentList')
-            let isEmpty = true
-            this.equipmentList.forEach(item => {
-              if (item.purchaseNum == '' || !item.purchaseNum) {
-                isEmpty = false
-              }
-            })
-            console.log(this.taskId)
 
-            this.maForm.taskId = this.taskId
-            this.maForm.partDetailsList = this.equipmentList
-            console.log(this.maForm)
-            if (isEmpty) {
-              if (this.equipmentList.length > 0) {
-                this.$modal
-                  .confirm('是否确认保存当前页面')
-                  .then(function() {})
-                  .then(() => {
-                    if (this.isEdit) {
-                      console.log('编辑')
-                      this.loading = true
-                      updatePurchaseAccessory(this.maForm).then(response => {
-                        if (response.code == 200) {
-                          this.$modal.msgSuccess('编辑成功')
-                          this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryList' })
-                        }
-                        this.loading = false
-                      })
-                    } else if (!this.isEdit) {
-                      console.log('新增')
-                      this.loading = true
-                      addPurchaseAccessory(this.maForm).then(response => {
-                        if (response.code == 200) {
-                          this.$modal.msgSuccess('新增成功')
-                          this.$tab.closeOpenPage({ path: '/store/newBuy/newAccessoryList' })
-                        }
-                        this.loading = false
-                      })
+        this.getUserList()
+        this.supplierInfoList()
+        this.getAccessoryTree()
+    },
+    methods: {
+        /** 查询用户列表--采购员 */
+        getUserList() {
+            getUserByRoleList({ roleIds: [152] }).then((response) => {
+                this.userList = response.data
+            })
+        },
+        /** 厂家 */
+        supplierInfoList() {
+            supplierInfoList().then((response) => {
+                this.supplierList = response.rows
+            })
+        },
+        /** 配件类型 */
+        getAccessoryTree() {
+            getAccessoryTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    item3.machineTypeName = item2.label
+                                    item3.specificationType = item3.label
+                                    item3.partId = item3.id
+                                    // item3.purchasePrice = 1
+                                    // item3.purchaseNum = 1
+                                    this.$set(item3, 'purchasePrice', 0)
+                                    this.$set(item3, 'purchaseNum', 1)
+                                })
+                            }
+                        })
                     }
-                  })
-                  .catch(() => {})
-              } else {
-                this.$modal.msgError('请先选择并添加机具类型！！！')
-              }
+                })
+            })
+        },
+        //添加机具类型
+        select(row) {
+            console.log(row)
+            if (row.level == 3) {
+                for (let i = 0; i < this.equipmentList.length; i++) {
+                    if (this.equipmentList[i].id == row.id) {
+                        this.equipmentList.splice(i, 1)
+                        break
+                    }
+                }
+                this.$set(row, 'supplierId', '')
+                this.$set(row, 'purchasePrice', 0)
+                this.$set(row, 'purchaseNum', 1)
+                this.equipmentList.unshift(row)
+            }
+        },
+        //选择机具厂家
+        // changeSupplier(supplierId) {
+        //     this.equipmentList.forEach((item) => {
+        //         this.$set(item, 'supplierId', supplierId)
+        //     })
+        // },
+        /** 新增按钮操作 */
+        handleSave() {
+            if (this.equipmentList.length > 0) {
+                this.$refs['maForm'].validate((valid) => {
+                    if (valid) {
+                        console.log(this.maForm, 'maForm')
+                        console.log(this.equipmentList, 'equipmentList')
+                        let isEmpty = true
+                        this.equipmentList.forEach((item) => {
+                            if (item.purchaseNum == '' || !item.purchaseNum) {
+                                isEmpty = false
+                            }
+                        })
+                        console.log(this.taskId)
+
+                        this.maForm.taskId = this.taskId
+                        this.maForm.partDetailsList = this.equipmentList
+                        console.log(this.maForm)
+                        if (isEmpty) {
+                            if (this.equipmentList.length > 0) {
+                                this.$modal
+                                    .confirm('是否确认保存当前页面')
+                                    .then(function () {})
+                                    .then(() => {
+                                        if (this.isEdit) {
+                                            console.log('编辑')
+                                            this.loading = true
+                                            updatePurchaseAccessory(
+                                                this.maForm,
+                                            ).then((response) => {
+                                                if (response.code == 200) {
+                                                    this.$modal.msgSuccess(
+                                                        '编辑成功',
+                                                    )
+                                                    this.$tab.closeOpenPage({
+                                                        path: '/store/newBuy/newAccessoryList',
+                                                    })
+                                                }
+                                                this.loading = false
+                                            })
+                                        } else if (!this.isEdit) {
+                                            console.log('新增')
+                                            this.loading = true
+                                            addPurchaseAccessory(
+                                                this.maForm,
+                                            ).then((response) => {
+                                                if (response.code == 200) {
+                                                    this.$modal.msgSuccess(
+                                                        '新增成功',
+                                                    )
+                                                    this.$tab.closeOpenPage({
+                                                        path: '/store/newBuy/newAccessoryList',
+                                                    })
+                                                }
+                                                this.loading = false
+                                            })
+                                        }
+                                    })
+                                    .catch(() => {})
+                            } else {
+                                this.$modal.msgError(
+                                    '请先选择并添加机具类型！！！',
+                                )
+                            }
+                        } else {
+                            this.$modal.msgError('请填写采购数量！！！')
+                        }
+                    }
+                })
             } else {
-              this.$modal.msgError('请填写采购数量！！！')
+                this.$modal.msgError('请先添加机具类型')
             }
-          }
-        })
-      } else {
-        this.$modal.msgError('请先添加机具类型')
-      }
-    },
-    // 返回列表页
-    jumpList() {
-      const obj = { path: '/store/newBuy/newAccessoryList' }
-      this.$tab.closeOpenPage(obj)
-    },
-    //获取任务详情--- 编辑回显数据
-    getTaskInfo() {
-      // this.loading = true;
-      getPurchaseAccessoryDetails({ taskId: this.taskId }).then(response => {
-        // this.taskInfo = response.data
-        this.maForm.purchaseTime = response.data.purchaseTime
-        this.maForm.arrivalTime = response.data.arrivalTime
-        this.maForm.purchaser = response.data.purchaser
-        this.maForm.remark = response.data.remark
-        this.equipmentList = response.data.partDetailsList
-        // this.loading = false;
-      })
-    },
+        },
+        // 返回列表页
+        jumpList() {
+            const obj = { path: '/store/newBuy/newAccessoryList' }
+            this.$tab.closeOpenPage(obj)
+        },
+        //获取任务详情--- 编辑回显数据
+        getTaskInfo() {
+            // this.loading = true;
+            getPurchaseAccessoryDetails({ taskId: this.taskId }).then(
+                (response) => {
+                    // this.taskInfo = response.data
+                    this.maForm.purchaseTime = response.data.purchaseTime
+                    this.maForm.arrivalTime = response.data.arrivalTime
+                    this.maForm.purchaser = response.data.purchaser
+                    this.maForm.remark = response.data.remark
+                    this.equipmentList = response.data.partDetailsList
+                    // this.loading = false;
+                },
+            )
+        },
 
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      console.log(row.id)
-      this.equipmentList.forEach((item, index) => {
-        if (item.id == row.id) {
-          this.equipmentList.splice(index, 1)
-        }
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([])
-      }
-      ;(this.menuExpand = false),
-        (this.menuNodeAll = false),
-        (this.deptExpand = true),
-        (this.deptNodeAll = false),
-        (this.form = {
-          roleId: undefined,
-          roleName: undefined,
-          roleKey: undefined,
-          roleSort: 0,
-          status: '0',
-          menuIds: [],
-          deptIds: [],
-          menuCheckStrictly: true,
-          deptCheckStrictly: true,
-          remark: undefined,
-        })
-      this.resetForm('form')
-    },
-
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-    //验收后禁止勾选
-    selectable(row, index) {
-      if (row.status == 0) {
-        return true
-      } else {
-        return false
-      }
-    },
-    /** 验收按钮操作 */
-    handleCheck(row) {
-      console.log(row)
-      let rowData = row
-      rowData.checkNum = rowData.purchaseNum
-      rowData.checkResult = rowData.checkResult || '通过'
-      this.form = rowData
-      this.open = true
-      this.title = '验收'
-    },
-    /** 验收提交按钮 */
-    submitForm: function() {
-      console.log(this.form)
-      let equipments = [this.form]
-      console.log(equipments)
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          checkPurchaseAccessory(equipments).then(response => {
-            if (response.code == 200) {
-              this.$message({
-                message: '验收成功',
-                type: 'success',
-              })
-              this.open = false
-              this.getTaskInfo()
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row.id)
+            this.equipmentList.forEach((item, index) => {
+                if (item.id == row.id) {
+                    this.equipmentList.splice(index, 1)
+                }
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            if (this.$refs.menu != undefined) {
+                this.$refs.menu.setCheckedKeys([])
             }
-          })
-        }
-      })
-    },
-    /** 批量验收按钮操作 */
-    handleListCheck() {
-      // console.log(this.ids)
+            ;(this.menuExpand = false),
+                (this.menuNodeAll = false),
+                (this.deptExpand = true),
+                (this.deptNodeAll = false),
+                (this.form = {
+                    roleId: undefined,
+                    roleName: undefined,
+                    roleKey: undefined,
+                    roleSort: 0,
+                    status: '0',
+                    menuIds: [],
+                    deptIds: [],
+                    menuCheckStrictly: true,
+                    deptCheckStrictly: true,
+                    remark: undefined,
+                })
+            this.resetForm('form')
+        },
 
-      this.aform = {
-        checkResult: '通过',
-        checkUrl: '',
-        checkUrlName: '',
-      }
-      this.imageUrl = ''
-      this.openAll = true
-      this.title = '批量验收'
-    },
-    submitListForm: function() {
-      console.log(this.aform)
-      this.ids.forEach(item => {
-        item.checkNum = item.purchaseNum
-        item.checkResult = this.aform.checkResult
-      })
-      console.log(this.ids)
-      let equipments = this.ids
-      console.log(equipments)
-      this.$refs['aform'].validate(valid => {
-        if (valid) {
-          checkPurchaseAccessory(equipments).then(response => {
-            if (response.code == 200) {
-              this.$message({
-                message: '验收成功',
-                type: 'success',
-              })
-              this.openAll = false
-              this.getTaskInfo()
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+        //验收后禁止勾选
+        selectable(row, index) {
+            if (row.status == 0) {
+                return true
+            } else {
+                return false
             }
-          })
-        }
-      })
-    },
+        },
+        /** 验收按钮操作 */
+        handleCheck(row) {
+            console.log(row)
+            let rowData = row
+            rowData.checkNum = rowData.purchaseNum
+            rowData.checkResult = rowData.checkResult || '通过'
+            this.form = rowData
+            this.open = true
+            this.title = '验收'
+        },
+        /** 验收提交按钮 */
+        submitForm: function () {
+            console.log(this.form)
+            let equipments = [this.form]
+            console.log(equipments)
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    checkPurchaseAccessory(equipments).then((response) => {
+                        if (response.code == 200) {
+                            this.$message({
+                                message: '验收成功',
+                                type: 'success',
+                            })
+                            this.open = false
+                            this.getTaskInfo()
+                        }
+                    })
+                }
+            })
+        },
+        /** 批量验收按钮操作 */
+        handleListCheck() {
+            // console.log(this.ids)
 
-    /** 导出按钮操作 */
-    handleExport() {
-      // this.download('material/purchaseAccessory/export', {
-      //   ...this.addForm
-      // }, `role_${new Date().getTime()}.xlsx`)
+            this.aform = {
+                checkResult: '通过',
+                checkUrl: '',
+                checkUrlName: '',
+            }
+            this.imageUrl = ''
+            this.openAll = true
+            this.title = '批量验收'
+        },
+        submitListForm: function () {
+            console.log(this.aform)
+            this.ids.forEach((item) => {
+                item.checkNum = item.purchaseNum
+                item.checkResult = this.aform.checkResult
+            })
+            console.log(this.ids)
+            let equipments = this.ids
+            console.log(equipments)
+            this.$refs['aform'].validate((valid) => {
+                if (valid) {
+                    checkPurchaseAccessory(equipments).then((response) => {
+                        if (response.code == 200) {
+                            this.$message({
+                                message: '验收成功',
+                                type: 'success',
+                            })
+                            this.openAll = false
+                            this.getTaskInfo()
+                        }
+                    })
+                }
+            })
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download('material/purchaseAccessory/export', {
+            //   ...this.addForm
+            // }, `role_${new Date().getTime()}.xlsx`)
+        },
     },
-  },
 }
 </script>
diff --git a/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index 925b066..7e84f67 100644
--- a/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -1,64 +1,139 @@
 <template>
-  <div class="app-container" id="newDevicesArrival">
-    <el-row :gutter="24" class="mb8">
-      <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-        <el-col :span="6">
-          <el-form-item label="机具类型" prop="equipmentId">
-            <treeselect v-model="queryParams.equipmentId" default-expand-all :options="equipmentTypeList"
-              placeholder="请选择机具类型" @select="select" :disable-branch-nodes="true" style="width: 240px;"
-              noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="出厂日期">
-            <el-date-picker v-model="queryParams.productionTime" style="width: 240px" value-format="yyyy-MM-dd"
-              type="date" placeholder="出厂日期" @change="changeTime"></el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="机具厂家" prop="supplierId">
-            <el-select v-model="queryParams.supplierId" placeholder="机具厂家" clearable filterable style="width: 240px"
-              @change="changeSupplier">
-              <el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier"
-                :value="item.supplierId" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="9"></el-col>
-      </el-form>
-    </el-row>
-    <el-form :model="maForm" ref="maForm" :rules="rules" size="small" :inline="true">
-      <el-row>
-        <el-form-item label="采购日期" prop="purchaseTime">
-          <el-date-picker v-model="maForm.purchaseTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
-            placeholder="请选择采购日期"></el-date-picker>
-        </el-form-item>
-        <el-form-item label="到货日期" prop="arrivalTime">
-          <el-date-picker v-model="maForm.arrivalTime" style="width: 240px" value-format="yyyy-MM-dd"
-            :picker-options="pickerOptions" type="date" placeholder="请选择到货日期"></el-date-picker>
-        </el-form-item>
-        <el-form-item label="采购员" prop="purchaser">
-          <el-select v-model="maForm.purchaser" filterable placeholder="请选择采购员" style="width: 100%;">
-            <el-option v-for="item in userList" :key="item.userId" :label="item.userName"
-              :value="item.userId"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="maForm.remark" placeholder="请输入备注" clearable maxlength="150" type="textarea"
-            style="width: 240px" />
-        </el-form-item>
-      </el-row>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="2">
-        <el-button type="success" plain icon="el-icon-back" size="mini" @click="jumpList">新购验收管理</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button>
-      </el-col>
+    <div class="app-container" id="newDevicesArrival">
+        <el-row :gutter="24" class="mb8">
+            <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
+            <el-form
+                :model="queryParams"
+                ref="queryForm"
+                size="small"
+                :inline="true"
+            >
+                <el-col :span="6">
+                    <el-form-item label="机具类型" prop="equipmentId">
+                        <treeselect
+                            v-model="queryParams.equipmentId"
+                            default-expand-all
+                            :options="equipmentTypeList"
+                            placeholder="请选择机具类型"
+                            @select="select"
+                            :disable-branch-nodes="true"
+                            style="width: 240px"
+                            noChildrenText="没有数据了"
+                            noOptionsText="没有数据"
+                            noResultsText="没有搜索结果"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="出厂日期">
+                        <el-date-picker
+                            v-model="queryParams.productionTime"
+                            style="width: 240px"
+                            value-format="yyyy-MM-dd"
+                            type="date"
+                            placeholder="出厂日期"
+                            @change="changeTime"
+                        ></el-date-picker>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="机具厂家" prop="supplierId">
+                        <el-select
+                            v-model="queryParams.supplierId"
+                            placeholder="机具厂家"
+                            clearable
+                            filterable
+                            style="width: 240px"
+                        >
+                            <el-option
+                                v-for="item in supplierList"
+                                :key="item.supplierId"
+                                :label="item.supplier"
+                                :value="item.supplierId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="9"></el-col>
+            </el-form>
+        </el-row>
+        <el-form
+            :model="maForm"
+            ref="maForm"
+            :rules="rules"
+            size="small"
+            :inline="true"
+        >
+            <el-row>
+                <el-form-item label="采购日期" prop="purchaseTime">
+                    <el-date-picker
+                        v-model="maForm.purchaseTime"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        placeholder="请选择采购日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="到货日期" prop="arrivalTime">
+                    <el-date-picker
+                        v-model="maForm.arrivalTime"
+                        style="width: 240px"
+                        value-format="yyyy-MM-dd"
+                        :picker-options="pickerOptions"
+                        type="date"
+                        placeholder="请选择到货日期"
+                    ></el-date-picker>
+                </el-form-item>
+                <el-form-item label="采购员" prop="purchaser">
+                    <el-select
+                        v-model="maForm.purchaser"
+                        filterable
+                        placeholder="请选择采购员"
+                        style="width: 100%"
+                    >
+                        <el-option
+                            v-for="item in userList"
+                            :key="item.userId"
+                            :label="item.userName"
+                            :value="item.userId"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input
+                        v-model="maForm.remark"
+                        placeholder="请输入备注"
+                        clearable
+                        maxlength="150"
+                        type="textarea"
+                        style="width: 240px"
+                    />
+                </el-form-item>
+            </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="2">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-back"
+                    size="mini"
+                    @click="jumpList"
+                    >新购验收管理</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleSave"
+                    >保存</el-button
+                >
+            </el-col>
 
-      <!-- <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
         <el-button
             type="danger"
             plain
@@ -79,458 +154,572 @@
             v-hasPermi="['system:role:export']"
         >导出</el-button>
       </el-col>-->
-    </el-row>
+        </el-row>
 
-    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="机具类型" prop="machineTypeName" :show-overflow-tooltip="true" width="200"></el-table-column>
-      <el-table-column label="规格型号" prop="specificationType" :show-overflow-tooltip="true" width="200" />
-      <el-table-column label="单位" prop="unitName" width="100" />
-      <el-table-column label="购置单价(元)" prop="purchasePrice" align="center" width="150">
-        <template slot-scope="scope">
-          <el-input-number v-model="scope.row.purchasePrice" controls-position="right" style="width: 100%;"
-            :min="0"></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column label="采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
-        <template slot-scope="scope">
-          <el-input-number v-model="scope.row.purchaseNum" controls-position="right" style="width: 100%;"
-            :min="1"></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column label="机具厂家" prop="supplierId" width="200">
-        <template slot-scope="scope">
-          <el-select v-model="scope.row.supplierId" placeholder="机具厂家" filterable clearable style="width: 180px">
-            <el-option v-for="item in supplierList" :key="item.supplierId" :label="item.supplier"
-              :value="item.supplierId" />
-          </el-select>
+        <el-table
+            v-loading="loading"
+            :data="equipmentList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序号" type="index" width="55" />
+            <el-table-column
+                label="机具类型"
+                prop="machineTypeName"
+                :show-overflow-tooltip="true"
+                width="200"
+            ></el-table-column>
+            <el-table-column
+                label="规格型号"
+                prop="specificationType"
+                :show-overflow-tooltip="true"
+                width="200"
+            />
+            <el-table-column label="单位" prop="unitName" width="100" />
+            <el-table-column
+                label="购置单价(元)"
+                prop="purchasePrice"
+                align="center"
+                width="150"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchasePrice"
+                        controls-position="right"
+                        style="width: 100%"
+                        :min="0"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="采购数量"
+                prop="purchaseNum"
+                width="150"
+                type="number"
+                maxlength="10"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchaseNum"
+                        controls-position="right"
+                        style="width: 100%"
+                        :min="1"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column label="机具厂家" prop="supplierId" width="200">
+                <template slot-scope="scope">
+                    <el-select
+                        v-model="scope.row.supplierId"
+                        placeholder="机具厂家"
+                        filterable
+                        clearable
+                        style="width: 180px"
+                    >
+                        <el-option
+                            v-for="item in supplierList"
+                            :key="item.supplierId"
+                            :label="item.supplier"
+                            :value="item.supplierId"
+                        />
+                    </el-select>
 
-          <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
-        </template>
-      </el-table-column>
-      <el-table-column label="出厂日期" align="center" prop="productionTime" width="200">
-        <template slot-scope="scope">
-          <el-date-picker v-model="scope.row.productionTime" style="width: 180px" value-format="yyyy-MM-dd" type="date"
-            range-separator="-" placeholder="出厂日期"></el-date-picker>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="150">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <!-- <el-button
+                    <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="出厂日期"
+                align="center"
+                prop="productionTime"
+                width="200"
+            >
+                <template slot-scope="scope">
+                    <el-date-picker
+                        v-model="scope.row.productionTime"
+                        style="width: 180px"
+                        value-format="yyyy-MM-dd"
+                        type="date"
+                        range-separator="-"
+                        placeholder="出厂日期"
+                    ></el-date-picker>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="150">
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <!-- <el-button
               size="mini"
               type="text"
               icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['system:role:edit']"
           >修改</el-button>-->
-          <el-button size="mini" type="text" icon="el-icon-document" v-if="scope.row.manageType == 2"
-            @click="handleDetail(scope.row)">明细</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" style="color: red;"
-            @click="handleDelete(scope.row)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-document"
+                        v-if="scope.row.manageType == 2"
+                        @click="handleDetail(scope.row)"
+                        >明细</el-button
+                    >
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        style="color: red"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <holdingpole-dialog :dialog-class="'my-custom-dialog'" :initial-visible="showDialog"
-      :holdingpoleData="holdingpoleData" @close="onDialogClose"></holdingpole-dialog>
-  </div>
+        <holdingpole-dialog
+            :dialog-class="'my-custom-dialog'"
+            :initial-visible="showDialog"
+            :holdingpoleData="holdingpoleData"
+            @close="onDialogClose"
+        ></holdingpole-dialog>
+    </div>
 </template>
 
 <script>
-import { addPurchaseCheckInfo, getPurchaseCheckInfo, updatePurchaseCheckInfo } from '@/api/store/newBuy'
+import {
+    addPurchaseCheckInfo,
+    getPurchaseCheckInfo,
+    updatePurchaseCheckInfo,
+} from '@/api/store/newBuy'
 import { getUserByRoleList } from '@/api/system/user'
 import { equipmentTypeTree, supplierInfoList } from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue';
+import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue'
 
-import { } from '@/api/store/newBuy'
+import {} from '@/api/store/newBuy'
 
 export default {
-  name: 'NewDevicesArrival',
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect, HoldingpoleDialog },
-  data() {
-    return {
-      taskId: '',
-      isEdit: false,
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      //机具厂家（供应商管理）
-      supplierList: [],
-      //机具类型
-      equipmentTypeList: [],
-      // 用户数据
-      userList: [],
-      // 角色表格数据
-      equipmentList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      showDialog: false,
-      holdingpoleData: {},
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: '1',
-          label: '全部数据权限',
-        },
-        {
-          value: '2',
-          label: '自定数据权限',
-        },
-        {
-          value: '3',
-          label: '本部门数据权限',
-        },
-        {
-          value: '4',
-          label: '本部门及以下数据权限',
-        },
-        {
-          value: '5',
-          label: '仅本人数据权限',
-        },
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        equipmentId: undefined,
-        productionTime: '',
-        supplierId: '',
-      },
-      maForm: {
-        purchaseTime: '',
-        arrivalTime: '',
-        purchaser: '',
-        remark: '',
-      },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label',
-      },
-      // 表单校验
-      rules: {
-        purchaseTime: [{ required: true, message: '采购日期不能为空', trigger: 'blur' }],
-        arrivalTime: [{ required: true, message: '到货日期不能为空', trigger: 'blur' }],
-        // purchaser: [
-        //   { required: true, message: "采购员不能为空", trigger: "blur" }
-        // ]
-      },
-    }
-  },
-  computed: {
-    pickerOptions() {
-      return {
-        disabledDate(time) {
-          const currentDate = new Date()
-          currentDate.setHours(0, 0, 0, 0)
-          return time.getTime() < currentDate.getTime()
-        },
-      }
-    },
-  },
-  watch: {
-    'maForm.purchaseTime'() {
-      if (this.maForm.purchaseTime != '') {
-        this.maForm.arrivalTime = ''
-      }
-    },
-  },
-  mounted() {
-    const taskId = this.$route.query && this.$route.query.taskId
-    this.taskId = taskId
-    if (this.taskId == '' || !this.taskId) {
-      this.isEdit = false
-    } else if (this.taskId != '') {
-      this.isEdit = true
-      this.getTaskInfo()
-    }
-
-    this.getUserList()
-    // this.getList();
-    this.equipmentType()
-    this.supplierInfoList()
-  },
-  methods: {
-    /** 查询用户列表--采购员 */
-    getUserList() {
-      getUserByRoleList({ roleId: '104' }).then(response => {
-        this.userList = response.data
-      })
-    },
-    /** 机具厂家 */
-    supplierInfoList() {
-      supplierInfoList().then(response => {
-        this.supplierList = response.rows
-      })
-    },
-    /** 机具类型 */
-    equipmentType() {
-      equipmentTypeTree().then(response => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children && item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children && item2.children.length > 0) {
-                item2.children.forEach(item3 => {
-                  if (item3.children && item3.children.length > 0) {
-                    item3.children.forEach(item4 => {
-                      item4.machineTypeName = item3.typeName
-                      item4.specificationType = item4.typeName
-                      this.$set(item4, 'purchasePrice', 0)
-                      this.$set(item4, 'purchaseNum', 1)
-                    })
-                  }
-                })
-              }
-            })
-          }
-        })
-      })
-    },
-    //添加机具类型
-    select(row) {
-      console.log(row)
-      if (row.level == 4) {
-        for (let i = 0; i < this.equipmentList.length; i++) {
-          if (this.equipmentList[i].typeId == row.typeId) {
-            this.equipmentList.splice(i, 1)
-            break
-          }
+    name: 'NewDevicesArrival',
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect, HoldingpoleDialog },
+    data() {
+        return {
+            taskId: '',
+            isEdit: false,
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            //机具厂家（供应商管理）
+            supplierList: [],
+            //机具类型
+            equipmentTypeList: [],
+            // 用户数据
+            userList: [],
+            // 角色表格数据
+            equipmentList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            openDataScope: false,
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            showDialog: false,
+            holdingpoleData: {},
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                equipmentId: undefined,
+                productionTime: '',
+                supplierId: '',
+            },
+            maForm: {
+                purchaseTime: '',
+                arrivalTime: '',
+                purchaser: '',
+                remark: '',
+            },
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            // 表单校验
+            rules: {
+                purchaseTime: [
+                    {
+                        required: true,
+                        message: '采购日期不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                arrivalTime: [
+                    {
+                        required: true,
+                        message: '到货日期不能为空',
+                        trigger: 'blur',
+                    },
+                ],
+                // purchaser: [
+                //   { required: true, message: "采购员不能为空", trigger: "blur" }
+                // ]
+            },
         }
-        this.$set(row, 'createTime', null)
-        this.$set(row, 'productionTime', '')
-        this.$set(row, 'supplierId', '')
-        this.$set(row, 'purchasePrice', 0)
-        this.$set(row, 'purchaseNum', 1)
-        this.equipmentList.unshift(row)
-      }
     },
-    //选择机具厂家
-    changeSupplier(supplierId) {
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'supplierId', supplierId)
-      })
+    computed: {
+        pickerOptions() {
+            return {
+                disabledDate(time) {
+                    const currentDate = new Date()
+                    currentDate.setHours(0, 0, 0, 0)
+                    return time.getTime() < currentDate.getTime()
+                },
+            }
+        },
     },
-    //选择出厂日期
-    changeTime(time) {
-      console.log(time)
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'productionTime', time)
-      })
+    watch: {
+        'maForm.purchaseTime'() {
+            if (this.maForm.purchaseTime != '') {
+                this.maForm.arrivalTime = ''
+            }
+        },
     },
+    mounted() {
+        const taskId = this.$route.query && this.$route.query.taskId
+        this.taskId = taskId
+        if (this.taskId == '' || !this.taskId) {
+            this.isEdit = false
+        } else if (this.taskId != '') {
+            this.isEdit = true
+            this.getTaskInfo()
+        }
 
-    //获取任务详情--- 编辑回显数据
-    getTaskInfo() {
-      // this.loading = true;
-      getPurchaseCheckInfo({ taskId: this.taskId, keyWord: this.queryParams.keyWord }).then(response => {
-        // this.taskInfo = response.data
-        this.maForm.purchaseTime = response.data.purchaseTime
-        this.maForm.arrivalTime = response.data.arrivalTime
-        this.maForm.purchaser = response.data.purchaser
-        this.maForm.remark = response.data.remark
-        this.equipmentList = response.data.checkDetailsList
-        // this.loading = false;
-      })
+        this.getUserList()
+        // this.getList();
+        this.equipmentType()
+        this.supplierInfoList()
     },
-
-    /** 查询右侧列表 */
-    getList() {
-      // this.loading = true;
-      // listRole().then(response => {
-      //       this.equipmentList = response.rows;
-      //       this.total = response.total;
-      //       this.loading = false;
-      //     }
-      // );
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([])
-      }
-      ; (this.menuExpand = false),
-        (this.menuNodeAll = false),
-        (this.deptExpand = true),
-        (this.deptNodeAll = false),
-        (this.form = {
-          roleId: undefined,
-          roleName: undefined,
-          roleKey: undefined,
-          roleSort: 0,
-          status: '0',
-          menuIds: [],
-          deptIds: [],
-          menuCheckStrictly: true,
-          deptCheckStrictly: true,
-          remark: undefined,
-        })
-      this.resetForm('form')
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-
-    /** 新增按钮操作 */
-    handleSave() {
-      if (this.equipmentList.length > 0) {
-        this.$refs['maForm'].validate(valid => {
-          if (valid) {
-            // console.log(this.maForm,'maForm')
-            // console.log(this.equipmentList,'equipmentList')
-            let isEmpty = true
-            this.equipmentList.forEach(item => {
-              if (item.purchaseNum == '' || !item.purchaseNum) {
-                isEmpty = false
-              }
+    methods: {
+        /** 查询用户列表--采购员 */
+        getUserList() {
+            getUserByRoleList({ roleIds: [152] }).then((response) => {
+                this.userList = response.data
             })
-            // console.log(this.taskId)
-
-            this.maForm.taskId = this.taskId
-            this.maForm.checkDetailsList = this.equipmentList
-            // console.log(this.maForm)
-            if (isEmpty) {
-              if (this.equipmentList.length > 0) {
-                this.$modal
-                  .confirm('是否确认保存当前页面')
-                  .then(function () { })
-                  .then(() => {
-                    if (this.isEdit) {
-                      console.log('编辑')
-                      this.loading = true
-                      updatePurchaseCheckInfo(this.maForm).then(response => {
-                        if (response.code == 200) {
-                          this.$modal.msgSuccess('编辑成功')
-                          this.$tab.closeOpenPage({ path: '/store/newBuy/newDevicesList' })
-                        }
-                        this.loading = false
-                      })
-                    } else if (!this.isEdit) {
-                      console.log('新增')
-                      this.loading = true
-                      addPurchaseCheckInfo(this.maForm).then(response => {
-                        if (response.code == 200) {
-                          this.$modal.msgSuccess('新增成功')
-                          this.$tab.closeOpenPage({ path: '/store/newBuy/newDevicesList' })
-                        }
-                        this.loading = false
-                      })
+        },
+        /** 机具厂家 */
+        supplierInfoList() {
+            supplierInfoList().then((response) => {
+                this.supplierList = response.rows
+            })
+        },
+        /** 机具类型 */
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (
+                                        item3.children &&
+                                        item3.children.length > 0
+                                    ) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName =
+                                                item3.typeName
+                                            item4.specificationType =
+                                                item4.typeName
+                                            this.$set(item4, 'purchasePrice', 0)
+                                            this.$set(item4, 'purchaseNum', 1)
+                                        })
+                                    }
+                                })
+                            }
+                        })
                     }
-                  })
-                  .catch(() => { })
-              } else {
-                this.$modal.msgError('请先选择并添加机具类型！！！')
-              }
-            } else {
-              this.$modal.msgError('请填写采购数量！！！')
+                })
+            })
+        },
+        //添加机具类型
+        select(row) {
+            console.log(row)
+            if (row.level == 4) {
+                for (let i = 0; i < this.equipmentList.length; i++) {
+                    if (this.equipmentList[i].typeId == row.typeId) {
+                        this.equipmentList.splice(i, 1)
+                        break
+                    }
+                }
+                // 如果有厂家则代入
+                if (this.queryParams.supplierId) {
+                    this.$set(row, 'supplierId', this.queryParams.supplierId)
+                } else {
+                    this.$set(row, 'supplierId', '')
+                }
+                this.$set(row, 'createTime', null)
+                this.$set(row, 'productionTime', '')
+                // this.$set(row, 'supplierId', '')
+                this.$set(row, 'purchasePrice', 0)
+                this.$set(row, 'purchaseNum', 1)
+                this.equipmentList.unshift(row)
             }
-          }
-        })
-      } else {
-        this.$modal.msgError('请先添加机具类型')
-      }
-    },
-    jumpList() {
-      const obj = { path: '/store/newBuy/newDevicesList' }
-      this.$tab.closeOpenPage(obj)
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      // this.reset();
-      //   this.form = response.data;
-      //   this.open = true;
-    },
-    /** 明细按钮操作 */
-    handleDetail(row) {
-      this.holdingpoleData = row
-      this.showDialog = true
-    },
-    onDialogClose() {
-      console.log('弹窗已关闭');
-      this.showDialog = false
-      // 在这里执行关闭后的相关操作
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      console.log(row.id)
-      this.$modal
-        .confirm('是否确认删除所选择的数据项？')
-        .then(() => {
-          this.equipmentList.forEach((item, index) => {
-            if (item.id == row.id) {
-              this.equipmentList.splice(index, 1)
-            }
-          })
-        })
-        .catch(() => { })
+        },
+        //选择机具厂家
+        // changeSupplier(supplierId) {
+        //     this.equipmentList.forEach((item) => {
+        //         this.$set(item, 'supplierId', supplierId)
+        //     })
+        // },
+        //选择出厂日期
+        changeTime(time) {
+            console.log(time)
+            this.equipmentList.forEach((item) => {
+                this.$set(item, 'productionTime', time)
+            })
+        },
 
-      // const roleIds = row.roleId || this.ids;
-      // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
-      //   return delRole(roleIds);
-      // }).then(() => {
-      //   this.getList();
-      //   this.$modal.msgSuccess("删除成功");
-      // }).catch(() => {});
+        //获取任务详情--- 编辑回显数据
+        getTaskInfo() {
+            // this.loading = true;
+            getPurchaseCheckInfo({
+                taskId: this.taskId,
+                keyWord: this.queryParams.keyWord,
+            }).then((response) => {
+                // this.taskInfo = response.data
+                this.maForm.purchaseTime = response.data.purchaseTime
+                this.maForm.arrivalTime = response.data.arrivalTime
+                this.maForm.purchaser = response.data.purchaser
+                this.maForm.remark = response.data.remark
+                this.equipmentList = response.data.checkDetailsList
+                // this.loading = false;
+            })
+        },
+
+        /** 查询右侧列表 */
+        getList() {
+            // this.loading = true;
+            // listRole().then(response => {
+            //       this.equipmentList = response.rows;
+            //       this.total = response.total;
+            //       this.loading = false;
+            //     }
+            // );
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 取消按钮（数据权限）
+        cancelDataScope() {
+            this.openDataScope = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            if (this.$refs.menu != undefined) {
+                this.$refs.menu.setCheckedKeys([])
+            }
+            ;(this.menuExpand = false),
+                (this.menuNodeAll = false),
+                (this.deptExpand = true),
+                (this.deptNodeAll = false),
+                (this.form = {
+                    roleId: undefined,
+                    roleName: undefined,
+                    roleKey: undefined,
+                    roleSort: 0,
+                    status: '0',
+                    menuIds: [],
+                    deptIds: [],
+                    menuCheckStrictly: true,
+                    deptCheckStrictly: true,
+                    remark: undefined,
+                })
+            this.resetForm('form')
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.roleId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+
+        /** 新增按钮操作 */
+        handleSave() {
+            if (this.equipmentList.length > 0) {
+                this.$refs['maForm'].validate((valid) => {
+                    if (valid) {
+                        // console.log(this.maForm,'maForm')
+                        // console.log(this.equipmentList,'equipmentList')
+                        let isEmpty = true
+                        this.equipmentList.forEach((item) => {
+                            if (item.purchaseNum == '' || !item.purchaseNum) {
+                                isEmpty = false
+                            }
+                        })
+                        // console.log(this.taskId)
+
+                        this.maForm.taskId = this.taskId
+                        this.maForm.checkDetailsList = this.equipmentList
+                        // console.log(this.maForm)
+                        if (isEmpty) {
+                            if (this.equipmentList.length > 0) {
+                                this.$modal
+                                    .confirm('是否确认保存当前页面')
+                                    .then(function () {})
+                                    .then(() => {
+                                        if (this.isEdit) {
+                                            console.log('编辑')
+                                            this.loading = true
+                                            updatePurchaseCheckInfo(
+                                                this.maForm,
+                                            ).then((response) => {
+                                                if (response.code == 200) {
+                                                    this.$modal.msgSuccess(
+                                                        '编辑成功',
+                                                    )
+                                                    this.$tab.closeOpenPage({
+                                                        path: '/store/newBuy/newDevicesList',
+                                                    })
+                                                }
+                                                this.loading = false
+                                            })
+                                        } else if (!this.isEdit) {
+                                            console.log('新增')
+                                            this.loading = true
+                                            addPurchaseCheckInfo(
+                                                this.maForm,
+                                            ).then((response) => {
+                                                if (response.code == 200) {
+                                                    this.$modal.msgSuccess(
+                                                        '新增成功',
+                                                    )
+                                                    this.$tab.closeOpenPage({
+                                                        path: '/store/newBuy/newDevicesList',
+                                                    })
+                                                }
+                                                this.loading = false
+                                            })
+                                        }
+                                    })
+                                    .catch(() => {})
+                            } else {
+                                this.$modal.msgError(
+                                    '请先选择并添加机具类型！！！',
+                                )
+                            }
+                        } else {
+                            this.$modal.msgError('请填写采购数量！！！')
+                        }
+                    }
+                })
+            } else {
+                this.$modal.msgError('请先添加机具类型')
+            }
+        },
+        jumpList() {
+            const obj = { path: '/store/newBuy/newDevicesList' }
+            this.$tab.closeOpenPage(obj)
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            // this.reset();
+            //   this.form = response.data;
+            //   this.open = true;
+        },
+        /** 明细按钮操作 */
+        handleDetail(row) {
+            this.holdingpoleData = row
+            this.showDialog = true
+        },
+        onDialogClose() {
+            console.log('弹窗已关闭')
+            this.showDialog = false
+            // 在这里执行关闭后的相关操作
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row.id)
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(() => {
+                    this.equipmentList.forEach((item, index) => {
+                        if (item.id == row.id) {
+                            this.equipmentList.splice(index, 1)
+                        }
+                    })
+                })
+                .catch(() => {})
+
+            // const roleIds = row.roleId || this.ids;
+            // this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+            //   return delRole(roleIds);
+            // }).then(() => {
+            //   this.getList();
+            //   this.$modal.msgSuccess("删除成功");
+            // }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            // this.download('system/role/export', {
+            //   ...this.queryParams
+            // }, `role_${new Date().getTime()}.xlsx`)
+        },
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // this.download('system/role/export', {
-      //   ...this.queryParams
-      // }, `role_${new Date().getTime()}.xlsx`)
-    },
-  },
 }
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 
 ::v-deep input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
+    -webkit-appearance: none !important;
 }
 
 ::v-deep input[type='number'] {
-  -moz-appearance: textfield !important;
+    -moz-appearance: textfield !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/store/newBuy/planAdd.vue b/src/views/store/newBuy/planAdd.vue
index d6f0e8c..fcd8a3a 100644
--- a/src/views/store/newBuy/planAdd.vue
+++ b/src/views/store/newBuy/planAdd.vue
@@ -1,44 +1,49 @@
 <template>
-  <div class="app-container" id="newDevicesArrival">
-    <el-row :gutter="24" class="mb8">
-      <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-        <el-col :span="10">
-          <el-form-item label="机具类型" prop="equipmentId">
-            <treeselect
-              v-model="queryParams.equipmentId"
-              default-expand-all
-              :options="equipmentTypeList"
-              placeholder="请选择机具类型"
-              @select="select"
-              :disable-branch-nodes="true"
-              style="width: 240px;"
-              noChildrenText="没有数据了"
-              noOptionsText="没有数据"
-              noResultsText="没有搜索结果"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="10">
-          <el-form-item label="基层单位" prop="unitId">
-            <el-select
-              v-model="queryParams.unitId"
-              filterable
-              placeholder="请选择基层单位"
-              style="width: 100%;"
-              @change="changeUnit"
+    <div class="app-container" id="newDevicesArrival">
+        <el-row :gutter="24" class="mb8">
+            <!-- <el-col :span="4" style="text-align:center;"><h4>新购任务信息:</h4></el-col> -->
+            <el-form
+                :model="queryParams"
+                ref="queryForm"
+                size="small"
+                :inline="true"
             >
-              <!-- <el-option label="请选择基层单位" :value="0"></el-option> -->
-              <el-option
-                v-for="item in unitList"
-                :key="item.unitId"
-                :label="item.unitName"
-                :value="item.unitId"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="6">
+                <el-col :span="10">
+                    <el-form-item label="机具类型" prop="equipmentId">
+                        <treeselect
+                            v-model="queryParams.equipmentId"
+                            default-expand-all
+                            :options="equipmentTypeList"
+                            placeholder="请选择机具类型"
+                            @select="select"
+                            :disable-branch-nodes="true"
+                            style="width: 240px"
+                            noChildrenText="没有数据了"
+                            noOptionsText="没有数据"
+                            noResultsText="没有搜索结果"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :span="10">
+                    <el-form-item label="基层单位" prop="unitId">
+                        <el-select
+                            v-model="queryParams.unitId"
+                            filterable
+                            placeholder="请选择基层单位"
+                            style="width: 100%"
+                            @change="changeUnit"
+                        >
+                            <!-- <el-option label="请选择基层单位" :value="0"></el-option> -->
+                            <el-option
+                                v-for="item in unitList"
+                                :key="item.unitId"
+                                :label="item.unitName"
+                                :value="item.unitId"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <!-- <el-col :span="6">
           <el-form-item label="出厂日期">
             <el-date-picker v-model="queryParams.productionTime" style="width: 240px" value-format="yyyy-MM-dd"
               type="date" placeholder="出厂日期" @change="changeTime"></el-date-picker>
@@ -54,11 +59,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="9"></el-col>-->
-      </el-form>
-    </el-row>
-    <el-form :model="maForm" ref="maForm" size="small" :inline="true">
-      <!-- <el-row> -->
-      <!-- <el-form-item label="采购日期" prop="purchaseTime">
+            </el-form>
+        </el-row>
+        <el-form :model="maForm" ref="maForm" size="small" :inline="true">
+            <!-- <el-row> -->
+            <!-- <el-form-item label="采购日期" prop="purchaseTime">
           <el-date-picker v-model="maForm.purchaseTime" style="width: 240px" value-format="yyyy-MM-dd" type="date"
             placeholder="请选择采购日期"></el-date-picker>
         </el-form-item>
@@ -73,442 +78,502 @@
               :value="item.userId"></el-option>
           </el-select>
       </el-form-item>-->
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="maForm.remark"
-          placeholder="请输入备注"
-          clearable
-          maxlength="150"
-          type="textarea"
-          style="width: 240px"
-        />
-      </el-form-item>
-      <!-- </el-row> -->
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="2">
-        <el-button type="success" plain icon="el-icon-back" size="mini" @click="backList">返回</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave">保存</el-button>
-      </el-col>
-    </el-row>
+            <el-form-item label="备注" prop="remark">
+                <el-input
+                    v-model="maForm.remark"
+                    placeholder="请输入备注"
+                    clearable
+                    maxlength="150"
+                    type="textarea"
+                    style="width: 240px"
+                />
+            </el-form-item>
+            <!-- </el-row> -->
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="2">
+                <el-button
+                    type="success"
+                    plain
+                    icon="el-icon-back"
+                    size="mini"
+                    @click="backList"
+                    >返回</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleSave"
+                    >保存</el-button
+                >
+            </el-col>
+        </el-row>
 
-    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" type="index" width="55" />
-      <el-table-column
-        label="机具类型"
-        prop="machineTypeName"
-        :show-overflow-tooltip="true"
-        width="200"
-      ></el-table-column>
-      <el-table-column
-        label="规格型号"
-        prop="specificationType"
-        :show-overflow-tooltip="true"
-        width="200"
-      />
-      <el-table-column label="单位" prop="unitName" width="100" />
-      <el-table-column label="购置单价(元)" prop="purchasePrice" align="center" width="150">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.purchasePrice"
-            controls-position="right"
-            style="width: 100%;"
-            :min="0"
-          ></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column label="采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.purchaseNum"
-            controls-position="right"
-            style="width: 100%;"
-            :min="1"
-          ></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column label="基层单位" prop="unitId" width="200">
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.unitId"
-            placeholder="基层单位"
-            filterable
-            clearable
-            style="width: 180px"
-          >
-            <el-option
-              v-for="item in unitList"
-              :key="item.unitId"
-              :label="item.unitName"
-              :value="item.unitId"
+        <el-table
+            v-loading="loading"
+            :data="equipmentList"
+            @selection-change="handleSelectionChange"
+        >
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="序号" type="index" width="55" />
+            <el-table-column
+                label="机具类型"
+                prop="machineTypeName"
+                :show-overflow-tooltip="true"
+                width="200"
+            ></el-table-column>
+            <el-table-column
+                label="规格型号"
+                prop="specificationType"
+                :show-overflow-tooltip="true"
+                width="200"
             />
-          </el-select>
+            <el-table-column label="单位" prop="unitName" width="100" />
+            <el-table-column
+                label="购置单价(元)"
+                prop="purchasePrice"
+                align="center"
+                width="150"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchasePrice"
+                        controls-position="right"
+                        style="width: 100%"
+                        :min="0"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="采购数量"
+                prop="purchaseNum"
+                width="150"
+                type="number"
+                maxlength="10"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchaseNum"
+                        controls-position="right"
+                        style="width: 100%"
+                        :min="1"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column label="基层单位" prop="unitId" width="200">
+                <template slot-scope="scope">
+                    <el-select
+                        v-model="scope.row.unitId"
+                        placeholder="基层单位"
+                        filterable
+                        clearable
+                        style="width: 180px"
+                    >
+                        <el-option
+                            v-for="item in unitList"
+                            :key="item.unitId"
+                            :label="item.unitName"
+                            :value="item.unitId"
+                        />
+                    </el-select>
 
-          <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
-        </template>
-      </el-table-column>
-      <!-- <el-table-column label="出厂日期" align="center" prop="productionTime" width="200">
+                    <!-- <el-input v-model="scope.row.supplierId"></el-input> -->
+                </template>
+            </el-table-column>
+            <!-- <el-table-column label="出厂日期" align="center" prop="productionTime" width="200">
         <template slot-scope="scope">
           <el-date-picker v-model="scope.row.productionTime" style="width: 180px" value-format="yyyy-MM-dd" type="date"
             range-separator="-" placeholder="出厂日期"></el-date-picker>
         </template>
       </el-table-column>-->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-            size="mini"
-            type="danger"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+                    <el-button
+                        size="mini"
+                        type="danger"
+                        icon="el-icon-delete"
+                        @click="handleDelete(scope.row)"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+    </div>
 </template>
 
 <script>
-import { addPlanManagement, getPurchaseCheckInfo, updatePurchaseCheckInfo } from '@/api/store/newBuy'
+import {
+    addPlanManagement,
+    getPurchaseCheckInfo,
+    updatePurchaseCheckInfo,
+} from '@/api/store/newBuy'
 import { getUserByRoleList } from '@/api/system/user'
-import { equipmentTypeTree, supplierInfoList, getunitInfoAll } from '@/api/store/tools'
+import {
+    equipmentTypeTree,
+    supplierInfoList,
+    getunitInfoAll,
+} from '@/api/store/tools'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 import {} from '@/api/store/newBuy'
 
 export default {
-  name: 'planAdd',
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect },
-  data() {
-    return {
-      planId: '',
-      isEdit: false,
-      // 遮罩层
-      loading: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      //机具厂家（供应商管理）
-      supplierList: [],
-      //机具类型
-      equipmentTypeList: [],
-      // 用户数据
-      userList: [],
-      // 基层单位数据
-      unitList: [],
-      // 角色表格数据
-      equipmentList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: '1',
-          label: '全部数据权限',
-        },
-        {
-          value: '2',
-          label: '自定数据权限',
-        },
-        {
-          value: '3',
-          label: '本部门数据权限',
-        },
-        {
-          value: '4',
-          label: '本部门及以下数据权限',
-        },
-        {
-          value: '5',
-          label: '仅本人数据权限',
-        },
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        equipmentId: undefined,
-        unitId: undefined,
-        // productionTime: '',
-        supplierId: '',
-      },
-      maForm: {
-        // purchaseTime: '',
-        // arrivalTime: '',
-        // purchaser: '',
-        remark: '',
-      },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label',
-      },
-      // 表单校验
-      // rules: {
-      // purchaseTime: [
-      //   { required: true, message: "采购日期不能为空", trigger: "blur" }
-      // ],
-      // arrivalTime: [
-      //   { required: true, message: "到货日期不能为空", trigger: "blur" }
-      // ],
-      // purchaser: [
-      //   { required: true, message: "采购员不能为空", trigger: "blur" }
-      // ]
-      // },
-    }
-  },
-  computed: {
-    pickerOptions() {
-      return {
-        disabledDate(time) {
-          const currentDate = new Date()
-          currentDate.setHours(0, 0, 0, 0)
-          return time.getTime() < currentDate.getTime()
-        },
-      }
-    },
-  },
-  watch: {
-    'maForm.purchaseTime'() {
-      if (this.maForm.purchaseTime != '') {
-        this.maForm.arrivalTime = ''
-      }
-    },
-  },
-  mounted() {
-    const planId = this.$route.query && this.$route.query.planId;
-    this.planId = planId;
-    if (this.planId == '' || !this.planId) {
-      this.isEdit = false
-    } else if (this.planId != '') {
-      this.isEdit = true
-      this.getTaskInfo()
-    }
-    //采购员
-    this.getUserList()
-    //机具类型
-    this.equipmentType()
-    //机具厂家
-    this.supplierInfoList()
-    //基层单位
-    this.getunitInfoAll()
-  },
-  methods: {
-    /** 查询用户列表--采购员 */
-    getUserList() {
-      getUserByRoleList({ roleId: '104' }).then(response => {
-        this.userList = response.data
-      })
-    },
-    /** 基层单位 */
-    getunitInfoAll() {
-      getunitInfoAll().then(response => {
-        console.log(response, 's')
-        this.unitList = response.rows
-      })
-    },
-    /** 机具厂家 */
-    supplierInfoList() {
-      supplierInfoList().then(response => {
-        this.supplierList = response.rows
-      })
-    },
-    /** 机具类型 */
-    equipmentType() {
-      equipmentTypeTree().then(response => {
-        this.equipmentTypeList = response.data
-        this.equipmentTypeList.forEach((item, index) => {
-          if (item.children && item.children.length > 0) {
-            item.children.forEach((item2, index2) => {
-              if (item2.children && item2.children.length > 0) {
-                item2.children.forEach(item3 => {
-                  if (item3.children && item3.children.length > 0) {
-                    item3.children.forEach(item4 => {
-                      item4.machineTypeName = item3.typeName
-                      item4.specificationType = item4.typeName
-                      this.$set(item4, 'purchasePrice', 0)
-                      this.$set(item4, 'purchaseNum', 1)
-                    })
-                  }
-                })
-              }
-            })
-          }
-        })
-      })
-    },
-    //添加机具类型
-    select(row) {
-      console.log(row)
-      if (row.level == 4) {
-        for (let i = 0; i < this.equipmentList.length; i++) {
-          if (this.equipmentList[i].typeId == row.typeId) {
-            this.equipmentList.splice(i, 1)
-            break
-          }
+    name: 'planAdd',
+    dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+        return {
+            planId: '',
+            isEdit: false,
+            // 遮罩层
+            loading: false,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            //机具厂家（供应商管理）
+            supplierList: [],
+            //机具类型
+            equipmentTypeList: [],
+            // 用户数据
+            userList: [],
+            // 基层单位数据
+            unitList: [],
+            // 角色表格数据
+            equipmentList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 是否显示弹出层（数据权限）
+            openDataScope: false,
+            menuExpand: false,
+            menuNodeAll: false,
+            deptExpand: true,
+            deptNodeAll: false,
+            // 日期范围
+            dateRange: [],
+            // 数据范围选项
+            dataScopeOptions: [
+                {
+                    value: '1',
+                    label: '全部数据权限',
+                },
+                {
+                    value: '2',
+                    label: '自定数据权限',
+                },
+                {
+                    value: '3',
+                    label: '本部门数据权限',
+                },
+                {
+                    value: '4',
+                    label: '本部门及以下数据权限',
+                },
+                {
+                    value: '5',
+                    label: '仅本人数据权限',
+                },
+            ],
+            // 菜单列表
+            menuOptions: [],
+            // 部门列表
+            deptOptions: [],
+            // 查询参数
+            queryParams: {
+                equipmentId: undefined,
+                unitId: undefined,
+                // productionTime: '',
+                supplierId: '',
+            },
+            maForm: {
+                // purchaseTime: '',
+                // arrivalTime: '',
+                // purchaser: '',
+                remark: '',
+            },
+            // 表单参数
+            form: {},
+            defaultProps: {
+                children: 'children',
+                label: 'label',
+            },
+            // 表单校验
+            // rules: {
+            // purchaseTime: [
+            //   { required: true, message: "采购日期不能为空", trigger: "blur" }
+            // ],
+            // arrivalTime: [
+            //   { required: true, message: "到货日期不能为空", trigger: "blur" }
+            // ],
+            // purchaser: [
+            //   { required: true, message: "采购员不能为空", trigger: "blur" }
+            // ]
+            // },
         }
-        // this.$set(row, 'createTime', null);
-        // this.$set(row, 'productionTime', '');
-        this.$set(row, 'unitId', '')
-        this.$set(row, 'purchasePrice', 0)
-        this.$set(row, 'purchaseNum', 1)
-        this.equipmentList.unshift(row)
-      }
     },
-    //选择基层单位
-    changeUnit(unitId) {
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'unitId', unitId)
-      })
+    computed: {
+        pickerOptions() {
+            return {
+                disabledDate(time) {
+                    const currentDate = new Date()
+                    currentDate.setHours(0, 0, 0, 0)
+                    return time.getTime() < currentDate.getTime()
+                },
+            }
+        },
     },
-    //选择机具厂家
-    changeSupplier(supplierId) {
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'supplierId', supplierId)
-      })
+    watch: {
+        'maForm.purchaseTime'() {
+            if (this.maForm.purchaseTime != '') {
+                this.maForm.arrivalTime = ''
+            }
+        },
     },
-    //选择出厂日期
-    changeTime(time) {
-      console.log(time)
-      this.equipmentList.forEach(item => {
-        this.$set(item, 'productionTime', time)
-      })
+    mounted() {
+        const planId = this.$route.query && this.$route.query.planId
+        this.planId = planId
+        if (this.planId == '' || !this.planId) {
+            this.isEdit = false
+        } else if (this.planId != '') {
+            this.isEdit = true
+            this.getTaskInfo()
+        }
+        //采购员
+        this.getUserList()
+        //机具类型
+        this.equipmentType()
+        //机具厂家
+        this.supplierInfoList()
+        //基层单位
+        this.getunitInfoAll()
     },
-    //获取任务详情--- 编辑回显数据
-    getTaskInfo() {
-      // this.loading = true;
-      getPurchaseCheckInfo({ planId: this.planId, keyWord: this.queryParams.keyWord }).then(response => {
-        // this.taskInfo = response.data
-        // this.maForm.purchaseTime = response.data.purchaseTime;
-        // this.maForm.arrivalTime = response.data.arrivalTime;
-        // this.maForm.purchaser = response.data.purchaser;
-        this.maForm.remark = response.data.remark
-        this.equipmentList = response.data.checkDetailsList
-        // this.loading = false;
-      })
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length != 1
-      this.multiple = !selection.length
-    },
-
-    /** 新增按钮操作 */
-    handleSave() {
-      if (this.equipmentList.length > 0) {
-        this.$refs['maForm'].validate(valid => {
-          if (valid) {
-            // console.log(this.maForm,'maForm')
-            // console.log(this.equipmentList,'equipmentList')
-            let isEmpty = true
-            this.equipmentList.forEach(item => {
-              if (item.purchaseNum == '' || !item.purchaseNum) {
-                isEmpty = false
-              }
+    methods: {
+        /** 查询用户列表--采购员 */
+        getUserList() {
+            getUserByRoleList({ roleIds: [152] }).then((response) => {
+                this.userList = response.data
             })
-            // console.log(this.planId)
-
-            this.maForm.planId = this.planId
-            this.maForm.checkDetailsList = this.equipmentList
-            console.log(this.maForm, 'sasa')
-            if (isEmpty) {
-              if (this.equipmentList.length > 0) {
-                this.$modal
-                  .confirm('是否确认保存当前页面')
-                  .then(function() {})
-                  .then(() => {
-                    if (this.isEdit) {
-                      console.log('编辑')
-                      // this.loading = true;
-                      // updatePurchaseCheckInfo(this.maForm).then(response => {
-                      //   if (response.code == 200) {
-                      //     this.$modal.msgSuccess("编辑成功");
-                      //     this.$tab.closeOpenPage({ path: "/store/plan/plan" });
-                      //   }
-                      //   this.loading = false;
-                      // })
-                    } else if (!this.isEdit) {
-                      console.log('新增')
-                      this.loading = true
-                      addPlanManagement(this.maForm).then(response => {
-                        if (response.code == 200) {
-                          this.$modal.msgSuccess('新增成功')
-                          this.$tab.closeOpenPage({ path: '/store/plan/plan' })
-                        }
-                        this.loading = false
-                      })
+        },
+        /** 基层单位 */
+        getunitInfoAll() {
+            getunitInfoAll().then((response) => {
+                console.log(response, 's')
+                this.unitList = response.rows
+            })
+        },
+        /** 机具厂家 */
+        supplierInfoList() {
+            supplierInfoList().then((response) => {
+                this.supplierList = response.rows
+            })
+        },
+        /** 机具类型 */
+        equipmentType() {
+            equipmentTypeTree().then((response) => {
+                this.equipmentTypeList = response.data
+                this.equipmentTypeList.forEach((item, index) => {
+                    if (item.children && item.children.length > 0) {
+                        item.children.forEach((item2, index2) => {
+                            if (item2.children && item2.children.length > 0) {
+                                item2.children.forEach((item3) => {
+                                    if (
+                                        item3.children &&
+                                        item3.children.length > 0
+                                    ) {
+                                        item3.children.forEach((item4) => {
+                                            item4.machineTypeName =
+                                                item3.typeName
+                                            item4.specificationType =
+                                                item4.typeName
+                                            this.$set(item4, 'purchasePrice', 0)
+                                            this.$set(item4, 'purchaseNum', 1)
+                                        })
+                                    }
+                                })
+                            }
+                        })
                     }
-                  })
-                  .catch(() => {})
-              } else {
-                this.$modal.msgError('请先选择并添加机具类型！！！')
-              }
+                })
+            })
+        },
+        //添加机具类型
+        select(row) {
+            console.log(row)
+            if (row.level == 4) {
+                for (let i = 0; i < this.equipmentList.length; i++) {
+                    if (this.equipmentList[i].typeId == row.typeId) {
+                        this.equipmentList.splice(i, 1)
+                        break
+                    }
+                }
+                // this.$set(row, 'createTime', null);
+                // this.$set(row, 'productionTime', '');
+                this.$set(row, 'unitId', '')
+                this.$set(row, 'purchasePrice', 0)
+                this.$set(row, 'purchaseNum', 1)
+                this.equipmentList.unshift(row)
+            }
+        },
+        //选择基层单位
+        changeUnit(unitId) {
+            this.equipmentList.forEach((item) => {
+                this.$set(item, 'unitId', unitId)
+            })
+        },
+        //选择机具厂家
+        changeSupplier(supplierId) {
+            this.equipmentList.forEach((item) => {
+                this.$set(item, 'supplierId', supplierId)
+            })
+        },
+        //选择出厂日期
+        changeTime(time) {
+            console.log(time)
+            this.equipmentList.forEach((item) => {
+                this.$set(item, 'productionTime', time)
+            })
+        },
+        //获取任务详情--- 编辑回显数据
+        getTaskInfo() {
+            // this.loading = true;
+            getPurchaseCheckInfo({
+                planId: this.planId,
+                keyWord: this.queryParams.keyWord,
+            }).then((response) => {
+                // this.taskInfo = response.data
+                // this.maForm.purchaseTime = response.data.purchaseTime;
+                // this.maForm.arrivalTime = response.data.arrivalTime;
+                // this.maForm.purchaser = response.data.purchaser;
+                this.maForm.remark = response.data.remark
+                this.equipmentList = response.data.checkDetailsList
+                // this.loading = false;
+            })
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.roleId)
+            this.single = selection.length != 1
+            this.multiple = !selection.length
+        },
+
+        /** 新增按钮操作 */
+        handleSave() {
+            if (this.equipmentList.length > 0) {
+                this.$refs['maForm'].validate((valid) => {
+                    if (valid) {
+                        // console.log(this.maForm,'maForm')
+                        // console.log(this.equipmentList,'equipmentList')
+                        let isEmpty = true
+                        this.equipmentList.forEach((item) => {
+                            if (item.purchaseNum == '' || !item.purchaseNum) {
+                                isEmpty = false
+                            }
+                        })
+                        // console.log(this.planId)
+
+                        this.maForm.planId = this.planId
+                        this.maForm.checkDetailsList = this.equipmentList
+                        console.log(this.maForm, 'sasa')
+                        if (isEmpty) {
+                            if (this.equipmentList.length > 0) {
+                                this.$modal
+                                    .confirm('是否确认保存当前页面')
+                                    .then(function () {})
+                                    .then(() => {
+                                        if (this.isEdit) {
+                                            console.log('编辑')
+                                            // this.loading = true;
+                                            // updatePurchaseCheckInfo(this.maForm).then(response => {
+                                            //   if (response.code == 200) {
+                                            //     this.$modal.msgSuccess("编辑成功");
+                                            //     this.$tab.closeOpenPage({ path: "/store/plan/plan" });
+                                            //   }
+                                            //   this.loading = false;
+                                            // })
+                                        } else if (!this.isEdit) {
+                                            console.log('新增')
+                                            this.loading = true
+                                            addPlanManagement(this.maForm).then(
+                                                (response) => {
+                                                    if (response.code == 200) {
+                                                        this.$modal.msgSuccess(
+                                                            '新增成功',
+                                                        )
+                                                        this.$tab.closeOpenPage(
+                                                            {
+                                                                path: '/store/plan/plan',
+                                                            },
+                                                        )
+                                                    }
+                                                    this.loading = false
+                                                },
+                                            )
+                                        }
+                                    })
+                                    .catch(() => {})
+                            } else {
+                                this.$modal.msgError(
+                                    '请先选择并添加机具类型！！！',
+                                )
+                            }
+                        } else {
+                            this.$modal.msgError('请填写采购数量！！！')
+                        }
+                    }
+                })
             } else {
-              this.$modal.msgError('请填写采购数量！！！')
+                this.$modal.msgError('请先添加机具类型')
             }
-          }
-        })
-      } else {
-        this.$modal.msgError('请先添加机具类型')
-      }
+        },
+        backList() {
+            const obj = { path: '/store/plan/plan' }
+            this.$tab.closeOpenPage(obj)
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row.id)
+            this.$modal
+                .confirm('是否确认删除所选择的数据项？')
+                .then(() => {
+                    this.equipmentList.forEach((item, index) => {
+                        if (item.id == row.id) {
+                            this.equipmentList.splice(index, 1)
+                        }
+                    })
+                })
+                .catch(() => {})
+        },
     },
-    backList() {
-      const obj = { path: '/store/plan/plan' }
-      this.$tab.closeOpenPage(obj)
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      console.log(row.id)
-      this.$modal
-        .confirm('是否确认删除所选择的数据项？')
-        .then(() => {
-          this.equipmentList.forEach((item, index) => {
-            if (item.id == row.id) {
-              this.equipmentList.splice(index, 1)
-            }
-          })
-        })
-        .catch(() => {})
-    },
-  },
 }
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-  width: 60px !important;
-  margin-bottom: 10px;
+    width: 60px !important;
+    margin-bottom: 10px;
 }
 
 ::v-deep input::-webkit-inner-spin-button {
-  -webkit-appearance: none !important;
+    -webkit-appearance: none !important;
 }
 
 ::v-deep input[type='number'] {
-  -moz-appearance: textfield !important;
+    -moz-appearance: textfield !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/store/tools/toolsType.vue b/src/views/store/tools/toolsType.vue
index 54bf034..e879500 100644
--- a/src/views/store/tools/toolsType.vue
+++ b/src/views/store/tools/toolsType.vue
@@ -757,10 +757,10 @@ export default {
         // },
         /** 查询用户列表--库管员，维修员 */
         getUserList() {
-            getUserByRoleList({ roleId: '101' }).then((response) => {
+            getUserByRoleList({ roleIds: [132, 139] }).then((response) => {
                 this.keeperList = response.data
             })
-            getUserByRoleList({ roleId: '102' }).then((response) => {
+            getUserByRoleList({ roleIds: [133] }).then((response) => {
                 this.repairUserList = response.data
             })
         },
diff --git a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
index ce092c8..480e034 100644
--- a/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
+++ b/src/views/warehouseManage/machinery/coding/component/MapDIalog.vue
@@ -37,14 +37,14 @@
             </el-card>
 
             <el-row :gutter="24" class="map-container">
-                <el-col :span="6">
+                <el-col :span="6" v-loading="loadingData">
                     <el-tabs type="border-card" class="map-left">
                         <el-tab-pane label="行程">
-                            <template v-if="tripList.length > 0">
+                            <template v-if="tripInfoListNew.length > 0">
                                 <div
                                     class="trip-container"
                                     @click="handlePreviewTrip(item, index)"
-                                    v-for="(item, index) in tripList"
+                                    v-for="(item, index) in tripInfoListNew"
                                     :key="index"
                                 >
                                     <div class="left-num">{{ index + 1 }}</div>
@@ -95,9 +95,7 @@
                                 </div>
                             </template>
                             <template v-else>
-                                {{
-                                    loadingData ? '数据加载中...' : '暂无数据 '
-                                }}
+                                {{ loadingData ? '数据加载中...' : '暂无数据' }}
                             </template>
                         </el-tab-pane>
                         <el-tab-pane label="停留点">
@@ -228,6 +226,8 @@ export default {
             parkList: [],
             warningList: [],
             loadingData: true,
+
+            tripInfoListNew: [], // 新行程信息
         }
     },
     created() {},
@@ -279,29 +279,30 @@ export default {
                 this.$message.error('请选择时间范围！')
                 return
             }
+            this.loadingData = true
             this.tripParams.iotId = this.iotCode
-            const res = await getIotDeviceTripApi({ ...this.tripParams })
-            console.log(res, '行程信息--')
+            // const res = await getIotDeviceTripApi({ ...this.tripParams })
+            // console.log(res, '行程信息--')
 
             const resS = await getIotDeviceParkDetailApi({ ...this.tripParams })
 
-            console.log(resS, '停留点信息--')
-
             const params = { ...this.tripParams }
             params.beginTime = params.beginTime.slice(0, 10)
             params.endTime = params.endTime.slice(0, 10)
             const resSs = await getIotDeviceAlarmApi(params)
 
+            this.loadingData = false
+
             this.warningList = resSs.data
             this.warningList.forEach((e) => {
                 e.warnTime = moment(parseInt(e.startAlarmTime)).format(
                     'YYYY-MM-DD HH:mm:ss',
                 )
             })
-            console.log(resSs, '报警信息--')
 
             this.parkList = resS.data
             this.parkList.forEach((e) => {
+                console.log(e, '----')
                 e.startTime = moment(parseInt(e.beginTime)).format(
                     'YYYY-MM-DD HH:mm:ss',
                 )
@@ -319,37 +320,71 @@ export default {
                         60,
                 )
             })
-            let tripInfo = JSON.parse(res.msg)
-            console.log(tripInfo, '反序列化之后', this.parkList)
 
-            let addressList = []
-            if (tripInfo.addressmap) {
-                addressList = Object.keys(tripInfo.addressmap)
-            }
-
-            tripInfo.totaltrips.forEach((e) => {
-                e.startTime = moment(e.trackstarttime).format(
-                    'YYYY-MM-DD HH:mm:ss',
-                )
-                e.endTime = moment(e.trackendtime).format('YYYY-MM-DD HH:mm:ss')
-
-                e.drivingDuration = parseInt(
-                    (e.trackendtime - e.trackstarttime) / 1000,
-                )
-
-                addressList.forEach((v) => {
-                    if (v.indexOf(e.slat.toString().slice(0, 7)) > -1) {
-                        e.startAddress = tripInfo.addressmap[v]
-                    }
-                    if (v.indexOf(e.elat.toString().slice(0, 7)) > -1) {
-                        e.endAddress = tripInfo.addressmap[v]
+            // 处理行程信息
+            this.tripInfoListNew = []
+            let tripInfoList = []
+            if (this.parkList.length > 1) {
+                this.parkList.forEach((e, index) => {
+                    if (index < this.parkList.length - 1) {
+                        let obj = {
+                            startTime: e.startTime,
+                            startAddress: e.address,
+                            startLng: e.callon,
+                            startLat: e.callat,
+                            endLng: '',
+                            endLat: '',
+                            endTime: '',
+                            endAddress: '',
+                        }
+                        tripInfoList.push(obj)
                     }
                 })
-            })
 
-            this.tripList = tripInfo.totaltrips
+                this.parkList.forEach((e, index) => {
+                    if (index > 0) {
+                        tripInfoList[index - 1].endTime = e.startTime
+                        tripInfoList[index - 1].endAddress = e.address
+                        tripInfoList[index - 1].endLng = e.callon
+                        tripInfoList[index - 1].endLat = e.callat
+                    }
+                })
+            }
 
-            console.log(tripInfo, '处理之后-----')
+            this.tripInfoListNew = tripInfoList
+
+            // console.log(tripInfoList, '处理后的行程---')
+            // let tripInfo = JSON.parse(res.msg)
+            // console.log(tripInfo, '反序列化之后', this.parkList)
+
+            // let addressList = []
+            // if (tripInfo.addressmap) {
+            //     addressList = Object.keys(tripInfo.addressmap)
+            // }
+
+            // tripInfo.totaltrips.forEach((e) => {
+            //     e.startTime = moment(e.trackstarttime).format(
+            //         'YYYY-MM-DD HH:mm:ss',
+            //     )
+            //     e.endTime = moment(e.trackendtime).format('YYYY-MM-DD HH:mm:ss')
+
+            //     e.drivingDuration = parseInt(
+            //         (e.trackendtime - e.trackstarttime) / 1000,
+            //     )
+
+            //     addressList.forEach((v) => {
+            //         if (v.indexOf(e.slat.toString().slice(0, 7)) > -1) {
+            //             e.startAddress = tripInfo.addressmap[v]
+            //         }
+            //         if (v.indexOf(e.elat.toString().slice(0, 7)) > -1) {
+            //             e.endAddress = tripInfo.addressmap[v]
+            //         }
+            //     })
+            // })
+
+            // this.tripList = tripInfo.totaltrips
+
+            // console.log(tripInfo, '处理之后-----')
         },
         /** 查看行程 */
         handlePreviewTrip(item, index) {
@@ -359,10 +394,10 @@ export default {
             }
             this.map.clearOverlays()
             let pointList = []
-            this.linePointList[0].lng = item.slon
-            this.linePointList[0].lat = item.slat
-            this.linePointList[1].lng = item.elon
-            this.linePointList[1].lat = item.elat
+            this.linePointList[0].lng = item.startLng
+            this.linePointList[0].lat = item.startLat
+            this.linePointList[1].lng = item.endLng
+            this.linePointList[1].lat = item.endLat
             if (this.linePointList.length === 0) return
             for (var i = 0; i < this.linePointList.length; i++) {
                 pointList.push(
@@ -381,9 +416,9 @@ export default {
             // polyline.setStrokeWeight(2) // 线宽
             this.trackAni = new BMapGLLib.TrackAnimation(this.map, polyline, {
                 overallView: true, // 动画完成后自动调整视野到总览
-                tilt: 30, // 轨迹播放的角度，默认为55
-                duration: 3000, // 动画持续时长，默认为10000，单位ms
-                delay: 500, // 动画开始的延迟，默认0，单位ms
+                tilt: 55, // 轨迹播放的角度，默认为55
+                duration: 1500, // 动画持续时长，默认为10000，单位ms
+                delay: 100, // 动画开始的延迟，默认0，单位ms
             })
             this.trackAni.start()
             // 设置起点终点图标
diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue
index d0aeec8..b6ffe2e 100644
--- a/src/views/warehouseManage/machinery/type/index.vue
+++ b/src/views/warehouseManage/machinery/type/index.vue
@@ -780,11 +780,11 @@ export default {
         // },
         /** 查询用户列表--库管员，维修员 */
         getUserList() {
-            getMaUserList().then((response) => {
+            getMaUserList({ roleIds: [132, 139] }).then((response) => {
                 console.log(response, '库管员')
                 this.keeperList = response.data
             })
-            getUserByRoleList().then((response) => {
+            getUserByRoleList({ roleIds: [133] }).then((response) => {
                 console.log(response, '维修员')
                 this.repairUserList = response.data
             })
diff --git a/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue b/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
index b54db68..853b301 100644
--- a/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
+++ b/src/views/warehouseManage/newPurchase/partsAcceptance/component/addParts.vue
@@ -87,7 +87,6 @@
                     filterable
                     :disabled="isDisabled"
                     style="width: 240px"
-                    @change="changeSupplier"
                 >
                     <el-option
                         v-for="item in supplierList"
@@ -605,7 +604,7 @@ export default {
     methods: {
         /** 查询用户列表--采购员 */
         getUserList() {
-            getUserByRoleList({ roleId: '104' }).then((response) => {
+            getUserByRoleList({ roleIds: [152] }).then((response) => {
                 this.userList = response.data
             })
         },
@@ -655,11 +654,11 @@ export default {
             }
         },
         //选择机具厂家
-        changeSupplier(supplierId) {
-            this.equipmentList.forEach((item) => {
-                this.$set(item, 'supplierId', supplierId)
-            })
-        },
+        // changeSupplier(supplierId) {
+        //     this.equipmentList.forEach((item) => {
+        //         this.$set(item, 'supplierId', supplierId)
+        //     })
+        // },
         /** 新增按钮操作 */
         handleSave() {
             if (this.equipmentList.length > 0) {
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
index b09a6ec..730414e 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/addTools.vue
@@ -41,7 +41,6 @@
                     clearable
                     filterable
                     style="width: 240px"
-                    @change="changeSupplier"
                 >
                     <el-option
                         v-for="item in supplierList"
@@ -463,20 +462,26 @@ export default {
                         break
                     }
                 }
+
+                // 如果有厂家则代入
+                if (this.queryParams.supplierId) {
+                    this.$set(row, 'supplierId', this.queryParams.supplierId)
+                } else {
+                    this.$set(row, 'supplierId', '')
+                }
                 this.$set(row, 'createTime', null)
                 this.$set(row, 'productionTime', '')
-                this.$set(row, 'supplierId', '')
                 this.$set(row, 'purchasePrice', 0)
                 this.$set(row, 'purchaseNum', 1)
                 this.equipmentList.unshift(row)
             }
         },
         //选择机具厂家
-        changeSupplier(supplierId) {
-            this.equipmentList.forEach((item) => {
-                this.$set(item, 'supplierId', supplierId)
-            })
-        },
+        // changeSupplier(supplierId) {
+        //     this.equipmentList.forEach((item) => {
+        //         this.$set(item, 'supplierId', supplierId)
+        //     })
+        // },
         //选择出厂日期
         changeTime(time) {
             console.log(time)
diff --git a/vue.config.js b/vue.config.js
index 0605a7e..c7109ca 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -42,7 +42,7 @@ module.exports = {
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://192.168.2.135:49080`, //超
+        target: `http://192.168.2.152:49080`, //超
         // target: `http://10.40.92.81:8080`, //韩/
         // target: `http://192.168.2.82:49080`,//旭/
         // target: `http://192.168.2.248:28080`, //帅