From 9f7c29a2d9a6af471346b4a25bc85e5c47353749 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 11 Nov 2024 12:12:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ma/partType.js                        |   17 +
 src/components/pageHeaderApply/index.vue      |   30 +
 .../lease/apply/component/addToolsApply.vue   |  885 +++++++
 .../lease/apply/component/homeApply.vue       |  937 +++++++
 .../lease/apply/component/queryToolsApply.vue |  404 +++
 src/views/material/lease/apply/index.vue      |   87 +
 src/views/material/ma/partType/index.vue      |   15 +-
 src/views/material/ma/type/index.vue          | 2298 +++++++++--------
 .../purchase/goodsArrived/component/home.vue  | 1652 ++++++------
 9 files changed, 4358 insertions(+), 1967 deletions(-)
 create mode 100644 src/components/pageHeaderApply/index.vue
 create mode 100644 src/views/material/lease/apply/component/addToolsApply.vue
 create mode 100644 src/views/material/lease/apply/component/homeApply.vue
 create mode 100644 src/views/material/lease/apply/component/queryToolsApply.vue
 create mode 100644 src/views/material/lease/apply/index.vue

diff --git a/src/api/ma/partType.js b/src/api/ma/partType.js
index 219eb964..046f87e4 100644
--- a/src/api/ma/partType.js
+++ b/src/api/ma/partType.js
@@ -61,4 +61,21 @@ export function addMaType(data) {
     method: 'post',
     data: data,
   })
+}
+
+// 配件类型管理--修改
+export function updateMaType(data) {
+  return request({
+    url: '/material/ma_part_type',
+    method: 'put',
+    data: data,
+  })
+}
+
+// 配件类型管理--删除
+export function delMaType(id) {
+  return request({
+    url: '/material/ma_part_type/' + id,
+    method: 'delete',
+  })
 }
\ No newline at end of file
diff --git a/src/components/pageHeaderApply/index.vue b/src/components/pageHeaderApply/index.vue
new file mode 100644
index 00000000..4b8f677c
--- /dev/null
+++ b/src/components/pageHeaderApply/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <!-- 页头提示 -->
+  <el-page-header @back="goBack" :content="pageContent"> </el-page-header>
+  <!--  -->
+</template>
+
+<script>
+export default {
+  name: "PageHeaderApply",
+  props: {
+    pageContent: {
+      type: String,
+      default: "详情",
+    },
+  },
+  methods: {
+    goBack() {
+      this.$emit("goBack");
+    },
+  },
+};
+</script>
+
+<style>
+.el-page-header {
+  padding-bottom: 5px;
+  margin-bottom: 10px;
+  box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.1);
+}
+</style>
\ No newline at end of file
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
new file mode 100644
index 00000000..abf7165b
--- /dev/null
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -0,0 +1,885 @@
+<template>
+  <!-- 新增工机具 -->
+  <div>
+    <el-form
+      :model="maForm"
+      ref="maForm"
+      size="small"
+      :rules="rules"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="到货日期" prop="arrivalTime">
+        <el-date-picker
+          v-model="maForm.arrivalTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd hh:mm:ss"
+          :picker-options="pickerOptions"
+          type="date"
+          placeholder="请选择到货日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="物资厂家" prop="supplierId">
+        <el-select
+          v-model="maForm.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-form-item label="出厂日期" prop="productionTime">
+        <el-date-picker
+          v-model="maForm.productionTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          type="date"
+          placeholder="请选择出厂日期"
+          @change="productionTimeChange"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="税率" prop="taxRate">
+        <el-input
+          v-model="maForm.taxRate"
+          placeholder="请输入税率"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          @input="taxRateChange"
+        />
+        <span>%</span>
+      </el-form-item>
+
+      <el-form-item label="类型规格" prop="deviceType">
+        <el-cascader
+          :key="propsKey"
+          v-model="deviceType"
+          :show-all-levels="false"
+          :options="equipmentTypeList"
+          :props="deviceTypeTreeProps"
+          filterable
+          collapse-tags
+          style="width: 240px"
+          placeholder="请选择规格型号"
+          ref="deviceTypeCascader"
+          popper-class="popper-select"
+          @change="deviceTypeChange"
+        ></el-cascader>
+      </el-form-item>
+
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="maForm.remark"
+          placeholder="请输入备注"
+          clearable
+          maxlength="150"
+          type="textarea"
+          style="width: 240px"
+          rows="1"
+        />
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <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-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</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 align="center" label="序号" type="index" width="55" />
+      <el-table-column
+        align="center"
+        label="物资名称"
+        prop="maTypeName"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        label="规格型号"
+        prop="typeName"
+        show-overflow-tooltip
+      />
+      <el-table-column align="center" label="单位" prop="unitName" />
+      <el-table-column label="采购数量" prop="purchaseNum" align="center">
+        <template v-slot="scope">
+          <el-input-number
+            v-model="scope.row.purchaseNum"
+            controls-position="right"
+            style="width: 100%"
+            :min="0"
+          ></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="购置单价(元含税)"
+        prop="purchaseTaxPrice"
+        align="center"
+      >
+        <template v-slot="scope">
+          <el-input-number
+            v-model="scope.row.purchaseTaxPrice"
+            controls-position="right"
+            style="width: 100%"
+            :min="0"
+            @change="purchaseTaxPriceChange(scope.row, scope.$index)"
+          ></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="购置单价(元不含税)"
+        prop="purchasePrice"
+        align="center"
+      >
+        <template slot-scope="scope">
+          <el-input-number
+            v-model="scope.row.purchasePrice"
+            controls-position="right"
+            style="width: 100%"
+            :min="0"
+            @input="purchasePriceChange(scope.row, scope.$index)"
+          ></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="是否为固定资产"
+        prop="fixCode"
+        align="center"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.fixCode"
+            placeholder="固定资产"
+            filterable
+            clearable
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </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: 100%"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="出厂日期"
+            clearable
+          ></el-date-picker>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="相关配套资料" align="center" prop="bmFileInfos">
+        <template slot-scope="scope">
+          <div
+            style="color: rgb(2, 167, 240); cursor: pointer"
+            @click="openFileDialog(scope.row)"
+          >
+            报告管理
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.purchase_task_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+
+      <!-- <el-table-column
+                align="center"
+                label="验收结论"
+                prop="checkResult"
+                show-overflow-tooltip
+            ></el-table-column> -->
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <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-dialog
+      title="报告管理"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+    >
+      <el-table :data="fileDataList" width="100%" height="350px">
+        <el-table-column label="序号" type="index" width="55" align="center" />
+        <el-table-column
+          label="报告类型"
+          align="center"
+          prop="dictLabel"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="文件名称"
+          align="center"
+          prop="name"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.maTypeName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="规格型号"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.typeName }}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+                <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <div
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+              "
+            >
+              <el-upload
+                ref="upload"
+                :limit="1"
+                :headers="upload.headers"
+                :action="upload.url"
+                :show-file-list="false"
+                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+                :on-success="handleFileSuccess"
+                :auto-upload="true"
+              >
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="beforeFileUpload(scope.row)"
+                >
+                  上传
+                </el-button>
+              </el-upload>
+
+              <el-button
+                size="mini"
+                type="text"
+                @click="picturePreview(scope.row)"
+                v-if="scope.row.url"
+              >
+                查看
+              </el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
+      <img width="100%" height="500px" :src="dialogImageUrl" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getPurchaseCheckInfo,
+  equipmentTypeTree,
+  addPurchaseCheckInfo,
+  updatePurchaseCheckInfo,
+} from "@/api/purchase/goodsArrived";
+import { getListFacturer } from "@/api/ma/supplier";
+import { getToken } from "@/utils/auth";
+import {
+  uploadPurchaseFile,
+  getPurchaseFileList,
+} from "@/api/purchase/goodsAccept";
+
+// import Treeselect from '@riophae/vue-treeselect'
+// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+// import HoldingpoleDialog from '@/components/HoldingpoleDialog/index.vue'
+
+export default {
+  name: "AddTools",
+  dicts: ["purchase_task_status"],
+  // components: { Treeselect, HoldingpoleDialog },
+  props: {
+    isEdit: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    editTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+    editId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      taskId: "",
+      // isEdit: false,
+      // 遮罩层
+      loading: false,
+      loadingTwo: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      //物资厂家
+      supplierList: [],
+      //机具类型
+      equipmentTypeList: [],
+      // 角色表格数据
+      equipmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      fileDataList: [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ],
+      //图片查看弹窗
+      dialogImageUrl: "",
+      dialogVisible: false,
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+      },
+      // 查询参数
+      queryParams: {
+        equipmentId: undefined,
+        productionTime: "",
+      },
+      maForm: {
+        taxRate: 13,
+        arrivalTime: "",
+        purchaser: "",
+        remark: "",
+        purchaseNumber: "",
+      },
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+      // 表单校验
+      rules: {
+        // deviceType: [
+        //     {
+        //         required: true,
+        //         message: '请选择类型规格',
+        //         trigger: 'blur',
+        //     },
+        // ],
+        arrivalTime: [
+          {
+            required: true,
+            message: "请选择到货日期",
+            trigger: "blur",
+          },
+        ],
+        // purchaser: [
+        //   { required: true, message: "采购员不能为空", trigger: "blur" }
+        // ]
+      },
+      deviceTypeTreeProps: {
+        children: "children",
+        label: "typeName",
+        // multiple: false,
+        value: "typeId",
+        multiple: true,
+      },
+      deviceType: [],
+      propsKey: 1000,
+      // taxRate:0,
+    };
+  },
+  computed: {
+    pickerOptions() {
+      return {
+        disabledDate(time) {
+          const currentDate = new Date();
+          currentDate.setHours(0, 0, 0, 0);
+          return time.getTime() < currentDate.getTime();
+        },
+      };
+    },
+  },
+  watch: {},
+  mounted() {
+    if (this.isEdit) {
+      console.log("isEdit", this.isEdit);
+      this.taskId = this.editTaskId;
+      this.id = this.editId;
+      this.getTaskInfo();
+    }
+    this.supplierInfoList();
+    this.equipmentType();
+  },
+  methods: {
+    // 税率
+    taxRateChange(val) {
+      this.maForm.taxRate = val.replace(/[^\d.]/g, "");
+      this.equipmentList.forEach((item) => {
+        item.purchaseTaxPrice = item.purchasePrice * (1 + val / 100);
+      });
+    },
+    // 含税单价
+    purchaseTaxPriceChange(row, val) {
+      // this.equipmentList[val].purchasePrice = (row.purchaseTaxPrice/(1 + this.maForm.taxRate/100)).toFixed(2)
+      row.purchasePrice = (
+        row.purchaseTaxPrice /
+        (1 + this.maForm.taxRate / 100)
+      ).toFixed(2);
+    },
+    // 不含税单价
+    purchasePriceChange(row, val) {
+      // this.equipmentList[val].purchaseTaxPrice = (row.purchasePrice*(1 + this.maForm.taxRate/100)).toFixed(2)
+      row.purchaseTaxPrice = (
+        row.purchasePrice *
+        (1 + this.maForm.taxRate / 100)
+      ).toFixed(2);
+    },
+    /** 物资厂家-下拉选 */
+    supplierInfoList() {
+      let param = {
+        pageNum: 1,
+        pageSize: 100,
+        keyWord: undefined,
+      };
+      getListFacturer(param).then((response) => {
+        this.supplierList = response.rows;
+      });
+    },
+    //选择物资厂家
+    // changeSupplier(supplierId) {
+    //     this.equipmentList.forEach((item) => {
+    //         this.$set(item, 'supplierId', supplierId)
+    //     })
+    // },
+    /** 机具类型 */
+    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.maTypeName = item3.typeName;
+                      item4.specificationType = item4.typeName;
+                      this.$set(item4, "purchaseTaxPrice", 0);
+                      this.$set(item4, "purchasePrice", 0);
+                    });
+                  }
+                });
+              }
+            });
+          }
+        });
+        //反显
+        let selectList = [];
+        this.equipmentList.forEach((e) => {
+          selectList.push(
+            this.getParentsById(this.equipmentTypeList, e.typeId)
+          );
+        });
+        this.deviceType = selectList;
+      });
+    },
+    //添加机具类型
+    deviceTypeChange(val) {
+      const deviceTypeList = this.$refs.deviceTypeCascader.getCheckedNodes();
+      let tempList = [];
+      if (val.length > 0) {
+        const items = val.map((e) => {
+          return e[3];
+        });
+        for (let i of items) {
+          for (let z of deviceTypeList) {
+            if (z.data.typeId === i) {
+              const obj = JSON.parse(JSON.stringify(z.data));
+              // obj.supplierId = ''
+              obj.createTime = null;
+              obj.productionTime = "";
+              obj.purchaseTaxPrice = 0;
+              obj.purchaseTaxPrice = 0;
+              obj.purchaseNum = 1;
+              obj.fixCode = "0";
+              obj.bmFileInfos = [];
+              tempList.push(obj);
+              break;
+            }
+          }
+        }
+        const newDataListNew = [...this.equipmentList, ...tempList];
+        const map = new Map();
+        for (let item of newDataListNew) {
+          if (!map.has(item.typeId)) {
+            map.set(item.typeId, item);
+          }
+        }
+        const newArray = [...map.values()];
+        let newArray_array = [];
+        items.forEach((e) => {
+          newArray.forEach((j) => {
+            if (e == j.typeId) {
+              newArray_array.push(j);
+            }
+          });
+        });
+        this.equipmentList = newArray_array;
+      } else {
+        this.equipmentList = [];
+      }
+    },
+    //选择出厂日期
+    productionTimeChange(val) {
+      this.equipmentList.forEach((item) => {
+        item.productionTime = val;
+      });
+    },
+    //获取任务详情--- 编辑回显数据
+    getTaskInfo() {
+      // this.loading = true;
+      getPurchaseCheckInfo({
+        taskId: this.taskId,
+        id: this.id,
+        taskStatus: 1,
+      }).then((response) => {
+        this.maForm = response.data.purchaseCheckInfo;
+        this.maForm.id = response.data.purchaseCheckInfo.id;
+        this.maForm.taskId = response.data.purchaseCheckInfo.taskId;
+        this.maForm.arrivalTime = response.data.purchaseCheckInfo.arrivalTime;
+        this.maForm.supplierId = response.data.purchaseCheckInfo.supplierId;
+        this.maForm.remark = response.data.purchaseCheckInfo.remark;
+        this.maForm.taxRate = response.data.purchaseCheckInfo.taxRate;
+        // this.maForm.purchaseNumber = response.data.purchaseNumber
+        // this.maForm.productionTime = response.data.purchaseCheckInfo.productionTime
+        this.equipmentList = response.data.purchaseCheckDetailsList;
+        console.log(this.equipmentList);
+        // this.loading = false;
+      });
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.roleId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 保存按钮操作 */
+    handleSave() {
+      // console.log(this.equipmentList)
+      if (this.equipmentList.length > 0) {
+        this.$refs["maForm"].validate((valid) => {
+          if (valid) {
+            this.maForm.taskId = this.taskId;
+            // this.maForm.checkDetailsList = this.equipmentList
+            this.$modal
+              .confirm("是否确认保存当前页面")
+              .then(function () {})
+              .then(() => {
+                if (this.isEdit) {
+                  console.log("编辑");
+                  this.loading = true;
+                  updatePurchaseCheckInfo({
+                    purchaseCheckDetailsList: this.equipmentList,
+                    purchaseCheckInfo: this.maForm,
+                  }).then((response) => {
+                    if (response.code == 200) {
+                      this.$modal.msgSuccess("编辑成功");
+                      // this.$tab.closeOpenPage({
+                      //     path: '/store/newBuy/newDevicesList',
+                      // })
+
+                      this.$emit("addToolsSuccessApply");
+                    }
+                    this.loading = false;
+                  });
+                } else if (!this.isEdit) {
+                  console.log("新增");
+                  // console.log(this.equipmentList)
+                  this.loading = true;
+                  addPurchaseCheckInfo({
+                    purchaseCheckDetailsList: this.equipmentList,
+                    purchaseCheckInfo: this.maForm,
+                  }).then((response) => {
+                    if (response.code == 200) {
+                      this.$modal.msgSuccess("新增成功");
+                      // this.$tab.closeOpenPage({
+                      //     path: '/store/newBuy/newDevicesList',
+                      // })
+
+                      this.$emit("addToolsSuccessApply");
+                    }
+                    this.loading = false;
+                  });
+                }
+              })
+              .catch(() => {});
+          }
+        });
+      } else {
+        this.$modal.msgError("请先添加机具类型");
+      }
+    },
+    //文件管理
+    openFileDialog(row) {
+      this.rowData = row;
+      this.fileDataList = [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ];
+      if (this.taskId == "") {
+        // console.log(this.rowData)
+        // console.log(this.rowData.bmFileInfos)
+        if (this.rowData.bmFileInfos.length > 0) {
+          this.rowData.bmFileInfos.forEach((item) => {
+            let index = this.fileDataList.findIndex(
+              (v) => v.fileType == item.fileType
+            );
+            this.fileDataList[index].name = item.name;
+            this.fileDataList[index].url = item.url;
+          });
+        }
+      } else {
+        this.getFileData();
+      }
+      this.open = true;
+    },
+    getFileData() {
+      let param = {
+        modelId: this.rowData.typeId,
+        taskType: 0,
+        taskId: this.rowData.taskId,
+      };
+      getPurchaseFileList(param)
+        .then((response) => {
+          if (response.rows.length > 0) {
+            response.rows.forEach((item) => {
+              let index = this.fileDataList.findIndex(
+                (v) => v.fileType == item.fileType
+              );
+              this.fileDataList[index].name = item.name;
+              this.fileDataList[index].url = item.url;
+            });
+          }
+        })
+        .catch(() => {});
+    },
+    beforeFileUpload(row) {
+      this.rowData.fileType = row.fileType;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 200) {
+        if (this.taskId == "") {
+          //新增逻辑
+          // console.log(response)
+          // console.log(this.rowData)
+          // console.log(this.rowData.bmFileInfos)
+          let obj = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          //根据文件上传返回更新文件管理弹窗内容
+          let index = this.fileDataList.findIndex(
+            (v) => v.fileType == this.rowData.fileType
+          );
+          this.fileDataList[index].name = response.data.name;
+          this.fileDataList[index].url = response.data.url;
+          //判断当前上传的文件是否已上传过-再往机具类型数据中插入
+          if (this.rowData.bmFileInfos.length > 0) {
+            let index2 = this.rowData.bmFileInfos.findIndex(
+              (v) => v.fileType == this.rowData.fileType
+            );
+            if (index2 > -1) {
+              //相同类型文件重复上传-替换
+              this.rowData.bmFileInfos.splice(index2, 0, obj);
+            } else {
+              //不存在相同类型文件-添加
+              this.rowData.bmFileInfos.push(obj);
+            }
+          } else {
+            this.rowData.bmFileInfos.push(obj);
+          }
+        } else {
+          //编辑逻辑
+          let param = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          uploadPurchaseFile(param)
+            .then((response) => {
+              this.$modal.msgSuccess("上传成功");
+              this.getFileData();
+            })
+            .catch(() => {
+              this.$modal.msgError("上传失败");
+            });
+        }
+      }
+    },
+    //图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split(".");
+      const extension = parts.pop();
+      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+        const windowName = file.name;
+        window.open(file.url, windowName);
+      } else {
+        this.dialogVisible = true;
+      }
+    },
+    //树结构数据获取父
+    getParentsById(list, id) {
+      for (let i in list) {
+        if (list[i].typeId == id) {
+          //查询到就返回该数组对象的value
+          return [list[i].typeId];
+        }
+        if (list[i].children) {
+          let node = this.getParentsById(list[i].children, id);
+          if (node !== undefined) {
+            //查询到把父节把父节点加到数组前面
+            node.unshift(list[i].typeId);
+            return node;
+          }
+        }
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // console.log(row.id)
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(() => {
+          this.deviceType.forEach((e, index) => {
+            if (e[3] === row.typeId) {
+              this.deviceType.splice(index, 1);
+              this.propsKey++;
+            }
+          });
+          this.equipmentList.forEach((item, index) => {
+            if (item.id == row.id) {
+              this.equipmentList.splice(index, 1);
+            }
+          });
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/exportDetails",
+        { taskId: this.taskId },
+        `新购到货详情_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style lang="scss">
+.popper-select {
+  .el-cascader-panel .el-scrollbar .el-checkbox {
+    display: none;
+  }
+
+  .el-cascader-panel .el-scrollbar:nth-child(4) .el-checkbox {
+    display: block !important;
+  }
+}
+</style>
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
new file mode 100644
index 00000000..071bac27
--- /dev/null
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -0,0 +1,937 @@
+<template>
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="日期">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 240px"
+        >
+        </el-date-picker>
+      </el-form-item>
+
+      <el-form-item label="设备状态" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择设备状态"
+          clearable
+          filterable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="typeItem in typesList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['lease:info:add']"
+          >领料申请</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleExport"
+          >发布</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" row-key="id" border>
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column width="60" align="center" label="序号" type="index" />
+      <el-table-column
+        align="center"
+        width="160"
+        label="申请时间"
+        prop="arrivalTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="申请人"
+        width="150"
+        align="center"
+        prop="code"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="租赁单位"
+        align="center"
+        prop="purchaseMaTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="租赁工程"
+        align="center"
+        prop="purchaseMaNumber"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="领料物资类型"
+        align="center"
+        prop="purchaseTaxPrice"
+        width="120px"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="purchasePrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="租赁申请单号"
+        align="center"
+        prop="taxRate"
+        width="120px"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+
+      <el-table-column
+        label="领料人"
+        align="center"
+        prop="supplier"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="领料人电话"
+        align="center"
+        prop="createBy"
+        width="120px"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="操作时间"
+        align="center"
+        width="160"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="taskStatus"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.purchase_task_status"
+            :value="scope.row.taskStatus"
+          />
+        </template>
+        <!-- <template slot-scope="scope">
+                    <span v-if="scope.row.taskStatus==0">待提交</span>
+                    <span v-if="scope.row.taskStatus==1">待通知</span>
+                    <span v-if="scope.row.taskStatus==2">待验收</span>
+                    <span v-if="scope.row.taskStatus==3">待绑定</span>
+                    <span v-if="scope.row.taskStatus==4">待入库</span>
+                    <span v-if="scope.row.taskStatus==5">已完成</span>
+                    <span v-if="scope.row.taskStatus==6">驳回待验收</span>
+                    <span v-if="scope.row.taskStatus==7">驳回待绑定</span>
+                    <span v-if="scope.row.taskStatus==8">驳回待入库</span>
+                    <span v-if="scope.row.taskStatus==9">入库进行中</span>
+                    <span v-if="scope.row.taskStatus==10">未完成</span>
+                </template> -->
+      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        width="100"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="normal"
+            @click="handleView(scope.row)"
+            v-if="scope.row.taskStatus != 24"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['purchase:info:edit']"
+            >编辑</el-button
+          >
+
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="success"
+            @click="handleNotice(scope.row)"
+            v-hasPermi="['purchase:person:notice']"
+            >通知</el-button
+          >
+          <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
+            >验收单</el-button
+          >
+
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDeletePurchase(scope.row)"
+            v-hasPermi="['purchase:info:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 验收单弹窗 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openPrint"
+      width="1100px"
+      append-to-body
+    >
+      <div style="height: 500px; overflow-y: scroll">
+        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+          <div
+            class="title"
+            style="text-align: center; font-weight: 600; font-size: 16px"
+          >
+            机具设备到货验收单
+          </div>
+          <div
+            class="info"
+            style="margin-top: 10px; display: flex; flex-wrap: wrap"
+          >
+            <div
+              class="item"
+              style="
+                width: 100%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>单据编号：</span>
+            </div>
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>生产厂家（供应商）：</span>
+            </div>
+
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>到货日期：</span>
+            </div>
+          </div>
+          <el-table
+            :data="printTableData"
+            class="table"
+            style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
+            border
+          >
+            <!--          <el-table-column type="selection" width="55" align="center" />-->
+            <el-table-column label="序号" align="center" type="index" row="2" />
+            <el-table-column
+              label="物资名称"
+              align="center"
+              prop="machineTypeName"
+            />
+            <el-table-column
+              label="规格型号"
+              align="center"
+              prop="specificationType"
+            />
+            <el-table-column label="单位" align="center" prop="unitName" />
+            <el-table-column label="配送信息" align="center">
+              <el-table-column
+                label="到货数量"
+                align="center"
+                prop="purchaseNum"
+              />
+              <el-table-column
+                label="验收结论"
+                align="center"
+                prop="purchaseNum"
+              />
+              <el-table-column label="质保质量" align="center">
+                <el-table-column
+                  label="实收份数"
+                  align="center"
+                  prop="purchaseNum"
+                />
+                <el-table-column
+                  label="符合要求"
+                  align="center"
+                  prop="purchaseNum"
+                />
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="备注" align="center" prop="unitName" />
+
+            <!--                        <el-table-column-->
+            <!--                            label="合格证及技术资料"-->
+            <!--                            align="center"-->
+            <!--                            prop=""-->
+            <!--                        />-->
+            <!--                        <el-table-column label="包装" align="center" prop="" />-->
+          </el-table>
+
+          <div
+            class="fillIn"
+            style="
+              margin-top: 20px;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <div class="item" style="width: 33%">
+              <div>
+                <span>供应科：</span>
+              </div>
+            </div>
+
+            <div class="item" style="width: 33%">
+              <div>
+                <span>生产技术科：</span>
+              </div>
+            </div>
+
+            <div class="item" style="width: 33%">
+              <div>
+                <span>库管班：</span>
+              </div>
+            </div>
+          </div>
+        </vue-easy-print>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="print">打 印</el-button>
+        <el-button @click="openPrint = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 通知弹窗 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="showPeople"
+      width="800px"
+      append-to-body
+      @close="cancel"
+    >
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form
+            :model="form"
+            ref="form"
+            size="small"
+            :inline="true"
+            :rules="rules"
+          >
+            <el-form-item label="通知内容:" prop="remark" label-width="100px">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                maxlength="100"
+                :autosize="{ minRows: 3, maxRows: 6 }"
+                placeholder="请输入通知内容"
+                style="width: 450px"
+              />
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+
+      <el-table
+        :data="getListPeople"
+        width="600px"
+        height="450"
+        @selection-change="handleSelectionUser"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+          :reserve-selection="true"
+        />
+        <el-table-column
+          label="人员名称"
+          align="center"
+          prop="userName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="所属机构"
+          align="center"
+          prop="deptName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="角色"
+          align="center"
+          prop="roleName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="联系电话"
+          align="center"
+          prop="telphone"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="danger"
+              @click="handleDeletePeople(scope.row)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="addUserOpen">人员添加</el-button>
+        <el-button type="primary" @click="configNotice">发起验收</el-button>
+      </div>
+    </el-dialog>
+
+    <!--    人员添加  -->
+    <el-dialog
+      title="人员添加"
+      :visible.sync="peopleOpen"
+      v-if="peopleOpen"
+      width="1000px"
+      append-to-body
+    >
+      <el-table
+        v-loading="loading"
+        :data="userList"
+        @selection-change="handleSelectionAddUser"
+        height="450"
+      >
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column
+          label="人员账号"
+          align="center"
+          key="userName"
+          prop="userName"
+          width="120"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="人员名称"
+          align="center"
+          key="nickName"
+          prop="nickName"
+          width="120"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="所属机构"
+          align="center"
+          key="deptName"
+          prop="deptName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="角色"
+          align="center"
+          key="roleName"
+          prop="roleName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="联系电话"
+          align="center"
+          key="telphone"
+          prop="telphone"
+        />
+        <!-- <el-table-column
+          label="操作"
+          align="center"
+          width="160"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope" v-if="scope.row.userId !== 1">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-plus"
+              @click="addUser(scope.row)"
+            >添加</el-button>
+
+          </template>
+        </el-table-column>-->
+      </el-table>
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="addUser">添加</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getListNewBuy,
+  getPurchaseCheckInfo,
+  getAcceptanceForm,
+  purchaseCheckInfoRemove,
+  getNoticePeople,
+  getListUnSelected,
+  addNoticeUser,
+  bmNoticeInfo,
+  delPeople,
+} from "@/api/purchase/goodsArrived";
+// import {
+//     getRepairedList,
+//     getRepairedDetailList,
+//     inputByType,
+//     getTypeList,
+// } from '@/api/store/warehousing'
+// import vueEasyPrint from 'vue-easy-print'
+// import { getLeaseAuditListAll } from '@/api/claimAndRefund/receive'
+
+export default {
+  name: "Home",
+  dicts: ["purchase_task_status"],
+  // components: { vueEasyPrint },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      loadingTwo: true,
+      updateTime: "",
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      showPeople: false,
+      peopleOpen: false,
+      // 总条数
+      total: 0,
+      totalTwo: 0,
+      //搜索下拉数据
+      typesList: [],
+      modelList: [],
+      // 字典表格数据
+      typeList: [],
+      getListPeople: [],
+      configUserList: [],
+      phoneNumbers: [],
+      //选择人员
+      chosenUserList: [],
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        time: null, //申请时间
+        name: undefined,
+        typeId: "",
+        keyWord: "",
+      },
+      form: {
+        remark: "",
+      },
+      // 表单校验
+      rules: {
+        remark: [
+          { required: true, message: "通知内容不能为空", trigger: "blur" },
+        ],
+      },
+      openPrint: false,
+      printData: {},
+      printTableData: [],
+      // 供应商
+      supplierStr: "",
+    };
+  },
+  created() {
+    this.getList();
+    // this.getTypeList()
+  },
+  methods: {
+    // getTypeList() {
+    //     getTypeList({ level: '3' }).then((response) => {
+    //         this.typesList = response.data
+    //     })
+    //     getTypeList({ level: '4' }).then((response) => {
+    //         this.modelList = response.data
+    //     })
+    // },
+
+    getList() {
+      this.loading = true;
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        startTime: this.queryParams.time && this.queryParams.time[0],
+        endTime: this.queryParams.time && this.queryParams.time[1],
+        typeId: this.queryParams.typeId,
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+      };
+      getListNewBuy(this.addDateRange(params)).then((response) => {
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.time = [];
+      this.resetForm("queryForm");
+      this.queryParams.keyWord = "";
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$emit("addTools");
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.$emit("queryTools", row.taskId, row.id);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$emit("editTools", row.taskId, row.id);
+    },
+
+    //----消息通知
+    getNowTime() {
+      var today = new Date();
+      var year = today.getFullYear(); //获取年份
+      var month = today.getMonth() + 1; //获取月份
+      var day = today.getDate(); //获取日期
+      return year + "-" + month + "-" + day;
+    },
+
+    handleNotice(row) {
+      this.reset();
+      this.form.taskId = row.taskId;
+      this.$set(
+        this.form,
+        "remark",
+        "各位同事您好，请于" +
+          this.getNowTime() +
+          "在宏源工业园，进行机具验收。"
+      );
+      this.getNoticeList();
+      this.showPeople = true;
+    },
+    getNoticeList() {
+      const taskId = this.form.taskId;
+      getNoticePeople({ taskId: taskId }).then((response) => {
+        this.getListPeople = response.rows;
+        this.showPeople = true;
+        this.loadingTwo = false;
+        this.title = "通知";
+      });
+    },
+    addUserOpen() {
+      this.getAllUserList();
+      this.peopleOpen = true;
+    },
+    /** 查询所有用户列表--可添加人员 */
+    getAllUserList() {
+      getListUnSelected().then((response) => {
+        this.userList = response.rows;
+      });
+    },
+
+    // 多选框选中-添加人员
+    handleSelectionAddUser(selection) {
+      // console.log(selection)
+      this.chosenUserList = selection;
+    },
+    //添加人员
+    addUser() {
+      if (this.chosenUserList.length < 1) {
+        this.$message.error("请选择人员！");
+        return;
+      }
+      // console.log(this.chosenUserList,"chosenUserList")
+      addNoticeUser(this.chosenUserList).then((response) => {
+        if (response.code == 200) {
+          this.getNoticeList();
+          this.peopleOpen = false;
+        }
+      });
+    },
+    handleDeletePeople(row) {
+      const ids = row.id;
+      this.$modal
+        .confirm("是否删除所选择的通知人员？")
+        .then(function () {
+          return delPeople(ids);
+        })
+        .then(() => {
+          this.getNoticeList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    // 多选框选中-通知人员
+    handleSelectionUser(selection) {
+      // console.log(selection)
+      this.configUserList = selection;
+    },
+    //确认消息通知
+    configNotice() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.configUserList.forEach((item, index) => {
+            console.log(item);
+            // item.telphone = item.telphone
+            // item.remark = this.form.remark
+            this.phoneNumbers.push(item.telphone);
+          });
+          let param = {
+            taskId: this.form.taskId,
+            phoneNumbers: this.phoneNumbers,
+            content: this.form.remark,
+          };
+          if (this.configUserList.length > 0) {
+            bmNoticeInfo(param).then((response) => {
+              console.log(response);
+              if (response.code == 200) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                });
+                this.noticeOpen = false;
+                this.getTaskInfo();
+              }
+            });
+          } else {
+            this.$message({
+              message: "请选择通知人员！",
+              type: "error",
+            });
+          }
+        }
+      });
+    },
+    // 人员取消按钮
+    cancel() {
+      this.showPeople = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        taskId: "",
+        remark: "",
+      };
+      this.resetForm("form");
+    },
+    // // 多选框选中数据
+    // handleSelectionChange(selection) {
+    //     this.ids = selection.map((item) => item.taskId)
+    //     this.single = selection.length != 1
+    //     this.multiple = !selection.length
+    // },
+
+    /** 验收按钮 */
+    handleAccept(row) {
+      // let query = { taskId: row.taskId }
+      // this.$tab.closeOpenPage({
+      //     path: '/store/newBuy/newDevicesAccept',
+      //     query,
+      // })
+      this.$emit("acceptToolsApply", row.taskId);
+    },
+    //编码管理
+    handleCode(row) {
+      // let query = { taskId: row.taskId }
+      // this.$tab
+      //     .closeOpenPage({
+      //         path: '/store/newBuy/newDevicesCode',
+      //         query,
+      //     })
+      //     .then(() => {
+      //         this.$tab.refreshPage()
+      //     })
+      this.$emit("codingTools", row.taskId);
+    },
+
+    //获取验收单数据
+    getPrintTable(taskId) {
+      getAcceptanceForm({ taskId: taskId }).then((response) => {
+        this.printData = response.data;
+        this.printTableData = response.data.checkDetailsList;
+
+        let supplierList = [];
+        this.printTableData.forEach((e) => {
+          if (e.supplier) {
+            supplierList.push(e.supplier);
+          }
+        });
+        supplierList = [...new Set(supplierList)];
+
+        this.supplierStr = supplierList.join(",");
+      });
+    },
+    //查看验收单
+    handlePrint(row) {
+      // this.query.taskId = row.taskId
+      // this.getPrintTable(row.taskId)
+      this.openPrint = true;
+      this.title = "机具设备到货验收单";
+    },
+    //打印
+    print() {
+      this.$refs.remarksPrintRef.print();
+    },
+
+    /** 删除按钮操作 */
+    handleDeletePurchase(row) {
+      // console.log(row)
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(function () {
+          return purchaseCheckInfoRemove(row.id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/export",
+        { ...this.queryParams },
+        `新购到货_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+
+  watch: {
+    $route: {
+      handler(to) {
+        if (to.query.keyWord) {
+          this.queryParams.keyWord = to.query.keyWord;
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 70px !important;
+  margin-bottom: 10px;
+}
+</style>
diff --git a/src/views/material/lease/apply/component/queryToolsApply.vue b/src/views/material/lease/apply/component/queryToolsApply.vue
new file mode 100644
index 00000000..2b0a373a
--- /dev/null
+++ b/src/views/material/lease/apply/component/queryToolsApply.vue
@@ -0,0 +1,404 @@
+<template>
+  <div>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出</el-button
+        >
+      </el-col>
+    </el-row>
+    <el-table v-loading="loading" :data="equipmentList">
+      <el-table-column label="序号" align="center" type="index" />
+      <el-table-column
+        label="物资名称"
+        align="center"
+        prop="maTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        align="center"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+      <el-table-column
+        label="采购数量"
+        align="center"
+        prop="purchaseNum"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+      <el-table-column
+        label="购置单价（元含税）"
+        align="center"
+        prop="purchaseTaxPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="购置单价（元不含税）"
+        align="center"
+        prop="purchasePrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否未固定资产"
+        align="center"
+        prop="fixCode"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="出厂日期"
+        align="center"
+        prop="productionTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="相关配套资料" align="center" prop="">
+        <template slot-scope="scope">
+          <div
+            style="color: rgb(2, 167, 240); cursor: pointer"
+            @click="openFileDialog(scope.row)"
+          >
+            报告管理
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="status"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.purchase_task_status"
+            :value="scope.row.status"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      title="报告管理"
+      :visible.sync="open"
+      width="900px"
+      append-to-body
+    >
+      <el-table :data="fileDataList" width="100%" height="350px">
+        <el-table-column label="序号" type="index" width="55" align="center" />
+        <el-table-column
+          label="报告类型"
+          align="center"
+          prop="dictLabel"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="文件名称"
+          align="center"
+          prop="name"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.maTypeName }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="规格型号"
+          align="center"
+          :show-overflow-tooltip="true"
+        >
+          <template>
+            <div>{{ this.rowData.typeName }}</div>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
+                <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <div
+              style="
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+              "
+            >
+              <!-- <el-upload ref="upload" :limit="1" :headers="upload.headers"
+                    :action="upload.url" :show-file-list="false" accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+                    :on-success="handleFileSuccess"   :auto-upload="true"
+                    >
+                    <el-button size="mini" type="text" @click="beforeFileUpload(scope.row)">
+                            上传
+                    </el-button>
+                    </el-upload> -->
+
+              <el-button
+                size="mini"
+                type="text"
+                @click="picturePreview(scope.row)"
+                v-if="scope.row.url"
+              >
+                查看
+              </el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+    <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
+      <img width="100%" height="500px" :src="dialogImageUrl" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getPurchaseCheckInfo } from "@/api/purchase/goodsArrived";
+import {
+  uploadPurchaseFile,
+  getPurchaseFileList,
+} from "@/api/purchase/goodsAccept";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "QueryTools",
+  dicts: ["purchase_task_status"],
+  components: {
+    // UploadImg,
+  },
+  props: {
+    isView: {
+      type: Boolean,
+      default: () => {
+        return false;
+      },
+    },
+    queryTaskId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+    queryId: {
+      type: [String, Number],
+      default: () => {
+        return "";
+      },
+    },
+  },
+  data() {
+    return {
+      fixCodeList: ["否", "是"],
+      //任务ID
+      taskId: "",
+      // 遮罩层
+      loading: true,
+      //任务数据
+      taskInfo: {},
+      // 表格数据
+      equipmentList: [],
+      // 是否显示弹出层
+      open: false,
+      rowData: {},
+      fileDataList: [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ],
+      //上传
+      upload: {
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+      },
+      //图片查看弹窗
+      dialogImageUrl: "",
+      dialogVisible: false,
+    };
+  },
+  computed: {},
+  mounted() {
+    this.taskId = this.queryTaskId;
+    this.id = this.queryId;
+    this.getTaskInfo();
+  },
+  methods: {
+    //获取任务详情-列表数据
+    getTaskInfo() {
+      this.loading = true;
+      getPurchaseCheckInfo({ taskId: this.taskId, id: this.id }).then(
+        (response) => {
+          this.taskInfo = response.data;
+          this.equipmentList = response.data.purchaseCheckDetailsList;
+          this.equipmentList.forEach((item) => {
+            item.fixCode = this.fixCodeList[Number(item.fixCode)];
+          });
+          this.loading = false;
+        }
+      );
+    },
+    //文件管理
+    openFileDialog(row) {
+      this.rowData = row;
+      this.fileDataList = [
+        { dictLabel: "合格证", fileType: "0", name: "", url: "" },
+        { dictLabel: "型式试验报告", fileType: "1", name: "", url: "" },
+        { dictLabel: "出厂检测报告", fileType: "2", name: "", url: "" },
+        { dictLabel: "第三方监测报告", fileType: "3", name: "", url: "" },
+        { dictLabel: "其他报告", fileType: "4", name: "", url: "" },
+      ];
+      this.getFileData();
+      this.open = true;
+    },
+    getFileData() {
+      let param = {
+        modelId: this.rowData.typeId,
+        taskType: 0,
+        taskId: this.rowData.taskId,
+      };
+      getPurchaseFileList(param)
+        .then((response) => {
+          if (response.rows.length > 0) {
+            response.rows.forEach((item) => {
+              let index = this.fileDataList.findIndex(
+                (v) => v.fileType == item.fileType
+              );
+              this.fileDataList[index].name = item.name;
+              this.fileDataList[index].url = item.url;
+            });
+          }
+        })
+        .catch(() => {});
+    },
+    beforeFileUpload(row) {
+      this.rowData.fileType = row.fileType;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      if (response.code == 200) {
+        if (this.taskId == "") {
+          //新增逻辑
+          // console.log(response)
+          // console.log(this.rowData)
+          // console.log(this.rowData.bmFileInfos)
+          let obj = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          //根据文件上传返回更新文件管理弹窗内容
+          let index = this.fileDataList.findIndex(
+            (v) => v.fileType == this.rowData.fileType
+          );
+          this.fileDataList[index].name = response.data.name;
+          this.fileDataList[index].url = response.data.url;
+          //判断当前上传的文件是否已上传过-再往机具类型数据中插入
+          if (this.rowData.bmFileInfos.length > 0) {
+            let index2 = this.rowData.bmFileInfos.findIndex(
+              (v) => v.fileType == this.rowData.fileType
+            );
+            if (index2 > -1) {
+              //相同类型文件重复上传-替换
+              this.rowData.bmFileInfos.splice(index2, 0, obj);
+            } else {
+              //不存在相同类型文件-添加
+              this.rowData.bmFileInfos.push(obj);
+            }
+          } else {
+            this.rowData.bmFileInfos.push(obj);
+          }
+        } else {
+          //编辑逻辑
+          let param = {
+            taskId: this.taskId,
+            taskType: "0",
+            name: response.data.name,
+            url: response.data.url,
+            modelId: this.rowData.typeId,
+            fileType: this.rowData.fileType,
+            //   "dictLabel": this.rowData.dictLabel,
+          };
+          uploadPurchaseFile(param)
+            .then((response) => {
+              this.$modal.msgSuccess("上传成功");
+              this.getFileData();
+            })
+            .catch(() => {
+              this.$modal.msgError("上传失败");
+            });
+        }
+      }
+    },
+    //图片查看
+    picturePreview(file) {
+      this.dialogImageUrl = file.url;
+      const parts = file.name.split(".");
+      const extension = parts.pop();
+      if (extension === "doc" || extension === "docx" || extension === "pdf") {
+        const windowName = file.name;
+        window.open(file.url, windowName);
+      } else {
+        this.dialogVisible = true;
+      }
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/exportDetails",
+        { taskId: this.taskId },
+        `新购到货详情_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 60px !important;
+  margin-bottom: 10px;
+}
+//隐藏图片上传框的css
+::v-deep.disabled {
+  .el-upload--picture-card {
+    display: none;
+  }
+}
+.custom-textarea {
+  width: 300px;
+  height: 100px;
+}
+.accept-img {
+  color: #409eff;
+
+  .a-two {
+    margin-left: 20px;
+  }
+}
+
+.left-tip {
+  font-size: 16px;
+  letter-spacing: 1px;
+}
+</style>
diff --git a/src/views/material/lease/apply/index.vue b/src/views/material/lease/apply/index.vue
new file mode 100644
index 00000000..8e68514d
--- /dev/null
+++ b/src/views/material/lease/apply/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <!-- 新购工机具管理 -->
+  <div class="app-container">
+    <PageHeaderApply
+      v-if="isShowComponent != 'Home'"
+      :pageContent="pageContent"
+      @goBack="goBack"
+    />
+    <component
+      :is="isShowComponent"
+      :isEdit="isEdit"
+      :editTaskId="editTaskId"
+      :editId="editId"
+      :queryTaskId="queryTaskId"
+      :queryId="queryId"
+      :isView="isView"
+      :codingTaskId="codingTaskId"
+      @addTools="addTools"
+      @editTools="editTools"
+      @addToolsSuccess="addToolsSuccess"
+      @queryTools="queryTools"
+    />
+  </div>
+</template>
+  
+<script>
+import PageHeaderApply from "@/components/pageHeaderApply";
+import Home from "./component/homeApply.vue"; // 主列表
+import AddTools from "./component/addToolsApply.vue"; // 新增机具 和 修改机具
+import QueryTools from "./component/queryToolsApply.vue"; // 查询机具 和 验收机具
+export default {
+  components: {
+    Home,
+    PageHeaderApply,
+    AddTools,
+    QueryTools,
+  },
+  data() {
+    return {
+      isShowComponent: "Home",
+      pageContent: "新增机具",
+      isEdit: false,
+      editTaskId: "",
+      editId: "",
+      queryId: "",
+      queryTaskId: "",
+      isView: false,
+      codingTaskId: "",
+    };
+  },
+
+  methods: {
+    /* 新增工机具 */
+    addTools() {
+      this.isEdit = false;
+      this.editTaskId = "";
+      this.queryTaskId = "";
+      this.pageContent = "新增机具";
+      this.isShowComponent = "AddTools";
+    },
+    /* 新增成功 */
+    addToolsSuccess() {
+      this.isShowComponent = "Home";
+    },
+    /* 编辑工机具 */
+    editTools(taskId, id) {
+      this.isEdit = true;
+      this.pageContent = "编辑机具";
+      this.editTaskId = taskId;
+      this.editId = id;
+      this.isShowComponent = "AddTools";
+    },
+    /* 查询工机具 */
+    queryTools(taskId, id) {
+      this.isView = true;
+      this.pageContent = "详情信息";
+      this.queryTaskId = taskId;
+      this.queryId = id;
+      this.isShowComponent = "QueryTools";
+    },
+    /* 返回按钮 */
+    goBack() {
+      this.isShowComponent = "Home";
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/material/ma/partType/index.vue b/src/views/material/ma/partType/index.vue
index 9b4fc7eb..45a171eb 100644
--- a/src/views/material/ma/partType/index.vue
+++ b/src/views/material/ma/partType/index.vue
@@ -367,6 +367,8 @@ import {
   editAccessory,
   delAccessory,
   addMaType,
+  updateMaType,
+  delMaType,
 } from "@/api/ma/partType";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -661,15 +663,15 @@ export default {
     removeTreeNode(data) {
       // this.$message.success('删除--')
       console.log(data, "删除时的数据源--");
-      const typeId = data.id;
+      const id = data.id;
       this.$modal
         .confirm("是否确认删除数据项？")
         .then(function () {
-          return delMaType(typeId);
+          return delMaType(id);
         })
         .then(() => {
           this.$modal.msgSuccess("删除成功");
-          this.getTreeData();
+          this.getTreeselect();
         })
         .catch(() => {});
     },
@@ -694,11 +696,10 @@ export default {
       };
 
       const editParams = {
-        houseId: id,
         paName,
         level: this.levelTemp,
         parentId: this.parentId,
-        typeId: id,
+        id: id,
       };
 
       this.$refs["addFormParamsRef"].validate(async (valid) => {
@@ -709,7 +710,7 @@ export default {
               this.$message.success("新增成功！");
               this.addTitleVisible = false;
               this.getList();
-              this.getTreeData();
+              this.getTreeselect();
             }
           } else {
             const res = await updateMaType(editParams);
@@ -717,7 +718,7 @@ export default {
               this.$message.success("修改成功！");
               this.addTitleVisible = false;
               this.getList();
-              this.getTreeData();
+              this.getTreeselect();
             }
           }
         }
diff --git a/src/views/material/ma/type/index.vue b/src/views/material/ma/type/index.vue
index 8324449f..1ba96cb3 100644
--- a/src/views/material/ma/type/index.vue
+++ b/src/views/material/ma/type/index.vue
@@ -1,1214 +1,1216 @@
 <template>
-    <!-- 类型管理 -->
-    <div class="app-container" id="toolsType">
-        <el-row :gutter="20">
-            <!--树数据-->
-            <el-col :span="5" :xs="24">
-                <div class="head-container">
-                    <el-input
-                        v-model="typeName"
-                        placeholder="请输入类型名称"
-                        clearable
-                        maxlength="50"
-                        size="small"
-                        prefix-icon="el-icon-search"
-                        style="margin-bottom: 20px"
-                    />
-                </div>
-                <div class="head-container" style>
-                    <el-tree
-                        style="height: 700px; overflow: scroll"
-                        :data="treeOptions"
-                        :props="defaultProps"
-                        :expand-on-click-node="false"
-                        :filter-node-method="filterNode"
-                        ref="tree"
-                        node-key="id"
-                        :default-expand-all="false"
-                        highlight-current
-                        @node-click="handleNodeClick"
-                    >
-                                               <span
-                            class="custom-tree-node"
-                            slot-scope="{ node, data }"
-                            @mousemove="onMousemove(data)"
-                            @mouseleave="onMouseleave()"
-                        >
-                            <span
-                                v-if="
-                                    isMousemoveId === data.id &&
-                                    node.label.length > 5
-                                "
-                                >{{ node.label.slice(0, 3) + '...' }}</span
-                            >
-                            <span v-else>{{ node.label }}</span>
+  <!-- 类型管理 -->
+  <div class="app-container" id="toolsType">
+    <el-row :gutter="20">
+      <!--树数据-->
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="typeName"
+            placeholder="请输入类型名称"
+            clearable
+            maxlength="50"
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container" style>
+          <el-tree
+            style="height: 700px; overflow: scroll"
+            :data="treeOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            :default-expand-all="false"
+            highlight-current
+            @node-click="handleNodeClick"
+          >
+            <span
+              class="custom-tree-node"
+              slot-scope="{ node, data }"
+              @mousemove="onMousemove(data)"
+              @mouseleave="onMouseleave()"
+            >
+              <span v-if="isMousemoveId === data.id && node.label.length > 5">{{
+                node.label.slice(0, 3) + "..."
+              }}</span>
+              <span v-else>{{ node.label }}</span>
 
-                            <span
-                                class="btn-items"
-                                v-if="isMousemoveId === data.id"
-                            >
-                                <el-button
-                                    type="text"
-                                    size="mini"
-                                    icon="el-icon-plus"
-                                    @click.stop="() => appendTreeNode(data)"
-                                >
-                                </el-button>
-                                <el-button
-                                    type="text"
-                                    size="mini"
-                                    icon="el-icon-edit-outline"
-                                    style="color: #67c23a"
-                                    v-if="data.id !== 0"
-                                    @click.stop="() => editTreeNode(data)"
-                                >
-                                </el-button>
-                                <el-button
-                                    type="text"
-                                    size="mini"
-                                    icon="el-icon-delete"
-                                    style="color: #f56c6c"
-                                    v-if="data.id !== 0"
-                                    @click.stop="() => removeTreeNode(data)"
-                                >
-                                </el-button>
-                            </span>
-                        </span>
-                    </el-tree>
-                </div>
-            </el-col>
-            <!--用户数据-->
-            <el-col :span="19" :xs="24">
-                <el-form
-                    :model="queryParams"
-                    ref="queryForm"
-                    size="small"
-                    :inline="true"
-                    v-show="showSearch"
-                    label-width="68px"
+              <span class="btn-items" v-if="isMousemoveId === data.id">
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-plus"
+                  @click.stop="() => appendTreeNode(data)"
                 >
-                    <el-form-item label="关键字" prop="keyword">
-                        <el-input
-                            v-model="queryParams.keyword"
-                            placeholder="请输入关键字"
-                            clearable
-                            style="width: 240px"
-                            @keyup.enter.native="handleQuery"
-                        />
-                    </el-form-item>
-
-                    <el-form-item>
-                        <el-button
-                            type="primary"
-                            icon="el-icon-search"
-                            size="mini"
-                            @click="handleQuery"
-                            >查询</el-button
-                        >
-                        <el-button
-                            icon="el-icon-refresh"
-                            size="mini"
-                            @click="resetQuery"
-                            >重置</el-button
-                        >
-                    </el-form-item>
-                </el-form>
-
-                <el-row :gutter="10" class="mb8">
-                     <el-col :span="1.5">
-                        <el-button
-                        type="warning"
-                        plain
-                        icon="el-icon-download"
-                        size="mini"
-                        @click="handleExport"
-                        >导出
-                        </el-button>
-                    </el-col> 
-                    <right-toolbar
-                        :showSearch.sync="showSearch"
-                        @queryTable="getList"
-                    ></right-toolbar>
-                </el-row>
-
-                <el-table
-                    v-loading="loading"
-                    :data="typeList"
-                    border
-                    @selection-change="handleSelectionChange"
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-edit-outline"
+                  style="color: #67c23a"
+                  v-if="data.id !== 0"
+                  @click.stop="() => editTreeNode(data)"
                 >
-                    <el-table-column
-                        label="类型编码"
-                        align="center"
-                        key="typeCode"
-                        prop="typeCode"
-                        show-overflow-tooltip
-                        v-if="false"
-                    />
-                    <el-table-column
-                        label="仓库信息"
-                        align="center"
-                        key="houseName"
-                        prop="houseName"
-                        show-overflow-tooltip
-                        v-if="false"
-                    />
-                    <el-table-column
-                        label="施工类型"
-                        align="center"
-                        key="itemType"
-                        prop="itemType"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="物资类型"
-                        align="center"
-                        key="materialType"
-                        prop="materialType"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="物资名称"
-                        align="center"
-                        key="materialName"
-                        prop="materialName"
-                        show-overflow-tooltip
-                    />
-                    <el-table-column
-                        label="规格型号"
-                        align="center"
-                        key="typeName"
-                        prop="typeName"
-                        show-overflow-tooltip
-                    >
-                    </el-table-column>
+                </el-button>
+                <el-button
+                  type="text"
+                  size="mini"
+                  icon="el-icon-delete"
+                  style="color: #f56c6c"
+                  v-if="data.id !== 0"
+                  @click.stop="() => removeTreeNode(data)"
+                >
+                </el-button>
+              </span>
+            </span>
+          </el-tree>
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="19" :xs="24">
+        <el-form
+          :model="queryParams"
+          ref="queryForm"
+          size="small"
+          :inline="true"
+          v-show="showSearch"
+          label-width="68px"
+        >
+          <el-form-item label="关键字" prop="keyword">
+            <el-input
+              v-model="queryParams.keyword"
+              placeholder="请输入关键字"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
 
-                    <el-table-column label="操作" align="center" width="180">
-                        <template slot-scope="scope">
-                            <el-button
-                                size="mini"
-                                type="text"
-                                icon="el-icon-edit"
-                                @click="handleView(scope.row)"
-                                v-hasPermi="['machinery:type:config']"
-                            >
-                                查看
-                            </el-button>
-                            <el-button
-                                size="mini"
-                                type="text"
-                                icon="el-icon-edit"
-                                @click="handleUpdate(scope.row)"
-                                v-hasPermi="['ma:type:edit']"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                size="mini"
-                                type="text"
-                                icon="el-icon-delete"
-                                @click="handleDelete(scope.row)"
-                                v-hasPermi="['ma:type:remove']"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >重置</el-button
+            >
+          </el-form-item>
+        </el-form>
 
-                <pagination
-                    v-show="total > 0"
-                    :total="total"
-                    :page.sync="queryParams.pageNum"
-                    :limit.sync="queryParams.pageSize"
-                    @pagination="getList"
-                />
-            </el-col>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              >导出
+            </el-button>
+          </el-col>
+          <right-toolbar
+            :showSearch.sync="showSearch"
+            @queryTable="getList"
+          ></right-toolbar>
         </el-row>
 
-        <!-- 添加或修改用户配置对话框 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="open"
-            width="1200px"
-            append-to-body
-            :close-on-click-modal="false"
+        <el-table
+          v-loading="loading"
+          :data="typeList"
+          border
+          @selection-change="handleSelectionChange"
         >
-            <el-form
-                ref="form"
-                :model="form"
-                :rules="rules"
-                label-width="120px"
+          <el-table-column
+            label="类型编码"
+            align="center"
+            key="typeCode"
+            prop="typeCode"
+            show-overflow-tooltip
+            v-if="false"
+          />
+          <el-table-column
+            label="仓库信息"
+            align="center"
+            key="houseName"
+            prop="houseName"
+            show-overflow-tooltip
+            v-if="false"
+          />
+          <el-table-column
+            label="施工类型"
+            align="center"
+            key="itemType"
+            prop="itemType"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="物资类型"
+            align="center"
+            key="materialType"
+            prop="materialType"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="物资名称"
+            align="center"
+            key="materialName"
+            prop="materialName"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            key="typeName"
+            prop="typeName"
+            show-overflow-tooltip
+          >
+          </el-table-column>
 
-            >
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="仓库信息">
-                            <!-- <el-select
+          <el-table-column label="操作" align="center" width="180">
+            <template slot-scope="scope">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleView(scope.row)"
+                v-hasPermi="['machinery:type:config']"
+              >
+                查看
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['ma:type:edit']"
+              >
+                编辑
+              </el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['ma:type:remove']"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1200px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="仓库信息">
+              <!-- <el-select
                                 v-model="form.keeperData"
                                 filterable
                                 placeholder="请选择仓库信息"
                                 style="width: 100%"
                                 :disabled="isLevel1Disabled"
                             > -->
-                             <el-input
-                                v-model="form.houseName"
-                                type="text"
-                                placeholder="请输入仓库信息"
-                                maxlength="30"
-                                :disabled="isLevel1Disabled"
-                            />
-                                <!-- <el-option 
+              <el-input
+                v-model="form.houseName"
+                type="text"
+                placeholder="请输入仓库信息"
+                maxlength="30"
+                :disabled="isLevel1Disabled"
+              />
+              <!-- <el-option 
                                     v-for="keeper in keeperDataRange"
                                     :key="keeper.value"
                                     :label="keeper.label"
                                     :value="keeper.value"
                                 ></el-option> -->
-                            
-                            <!-- </el-select> -->
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="施工类型">
-                            <el-input
-                                v-model="form.itemType"
-                                type="text"
-                                placeholder="请输入施工类型"
-                                maxlength="30"
-                                :disabled="isLevel2Disabled"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="物资类型">
-                            <el-input
-                                v-model="form.materialType"
-                                type="text"
-                                placeholder="请输入物资类型"
-                                maxlength="30"
-                                :disabled="isLevel3Disabled"
-                            />
-                        </el-form-item>
 
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="物资名称" >
-                            <el-input
-                                v-model="form.materialName"
-                                type="text"
-                                placeholder="请输入物资名称"
-                                maxlength="30"
-                                :disabled="isLevel4Disabled"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+              <!-- </el-select> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="施工类型">
+              <el-input
+                v-model="form.itemType"
+                type="text"
+                placeholder="请输入施工类型"
+                maxlength="30"
+                :disabled="isLevel2Disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="物资类型">
+              <el-input
+                v-model="form.materialType"
+                type="text"
+                placeholder="请输入物资类型"
+                maxlength="30"
+                :disabled="isLevel3Disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="物资名称">
+              <el-input
+                v-model="form.materialName"
+                type="text"
+                placeholder="请输入物资名称"
+                maxlength="30"
+                :disabled="isLevel4Disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="规格型号" prop="typeName">
-                            <el-input
-                                v-model="form.typeName"
-                                type="text"
-                                placeholder="请输入规格型号"
-                                maxlength="10"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="计量单位" prop="unitName">
-                            <el-input
-                                v-model="form.unitName"
-                                type="text"
-                                placeholder="请输入计量单位"
-                                maxlength="30"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="规格型号" prop="typeName">
+              <el-input
+                v-model="form.typeName"
+                type="text"
+                placeholder="请输入规格型号"
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unitName">
+              <el-input
+                v-model="form.unitName"
+                type="text"
+                placeholder="请输入计量单位"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="6">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="总保有量" prop="name9">
+              <el-input
+                v-model="form.name9"
+                type="number"
+                placeholder="请输入总保有量"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="在库数量" prop="name8">
+              <el-input
+                v-model="form.name8"
+                type="number"
+                placeholder="请输入在库数量"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="在用数量" prop="name7">
+              <el-input
+                v-model="form.name7"
+                type="number"
+                placeholder="请输入在用数量"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="在修数量" prop="name6">
+              <el-input
+                v-model="form.name6"
+                type="number"
+                placeholder="请输入在修数量"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                        <el-form-item label="总保有量" prop="name9" >
-                            <el-input
-                                v-model="form.name9"
-                                type="number"
-                                placeholder="请输入总保有量"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="在库数量" prop="name8">
-                            <el-input
-                                v-model="form.name8"
-                                type="number"
-                                placeholder="请输入在库数量"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                        </el-col>
-                        <el-col :span="6">
-                        <el-form-item label="在用数量" prop="name7">
-                            <el-input
-                                v-model="form.name7"
-                                type="number"
-                                placeholder="请输入在用数量"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="在修数量" prop="name6">
-                            <el-input
-                                v-model="form.name6"
-                                type="number"
-                                placeholder="请输入在修数量"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="待报废数量" prop="name5">
+              <el-input
+                v-model="form.name5"
+                type="number"
+                placeholder="请输入待报废数量"
+                maxlength="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="丢失数量" prop="name4">
+              <el-input
+                v-model="form.name4"
+                type="number"
+                placeholder="请输入丢失数量"
+                maxlength="30"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="待报废数量" prop="name5" >
-                            <el-input
-                                v-model="form.name5"
-                                type="number"
-                                placeholder="请输入待报废数量"
-                                maxlength="10"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="丢失数量" prop="name4">
-                            <el-input
-                                v-model="form.name4"
-                                type="number"
-                                placeholder="请输入丢失数量"
-                                maxlength="30"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="购置价(元/含税)" prop="name3" label-width="120px">
-                            <el-input
-                                v-model="form.name3"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="赔偿价(元)" prop="name2" label-width="120px">
-                            <el-input
-                                v-model="form.name2"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="租赁价(元/天)" prop="name1" label-width="120px">
-                            <el-input
-                                v-model="form.name1"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 160px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="购置价(元/不含税)" prop="name10" label-width="130px">
-                            <el-input
-                                v-model="form.name10"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 160px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-
-
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="管理模式" prop="manageType">
-                            <el-select
-                                v-model="form.manageType"
-                                filterable
-                                placeholder="请选择"
-                                style="width: 100%"
-                            >
-                                <el-option value="0" label="编码管理"
-                                    >编码管理</el-option
-                                >
-                                <el-option value="1" label="数量管理"
-                                    >数量管理</el-option
-                                >
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                        <el-col :span="6">
-                        <el-form-item label="是否扣税" prop="isCharging">
-                            <el-select
-                                v-model="form.isCharging"
-                                filterable
-                                placeholder="请选择"
-                                style="width: 100%"
-                            >
-                                <el-option value="0" label="扣税"
-                                    >扣税</el-option
-                                >
-                                <el-option value="1" label="不扣税"
-                                    >不扣税</el-option
-                                >
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="6">
-                        <el-form-item label="检验周期" prop="testCycle">
-                            <el-input
-                                v-model="form.testCycle"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 150px;"
-                            />
-                            <span style="color:black;">月</span>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="抽检比例(%)" prop="name11">
-                            <el-input
-                                v-model="form.name11"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="核定载荷(T/MPa)" prop="ratedLoad" label-width="120px">
-                            <el-input
-                                v-model="form.ratedLoad"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 160px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                        <el-col :span="6">
-                        <el-form-item label="试验载荷(T/MPa)" prop="testLoad" label-width="130px">
-                            <el-input
-                                v-model="form.testLoad"
-                                placeholder="请输入"
-                                maxlength="20"
-                                style="width: 160px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="持荷时间(分)" prop="holdingTime">
-                            <el-input
-                                v-model="form.holdingTime"
-                                placeholder="请输入"
-                                maxlength="20"
-                                 style="width: 170px;"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="库管员">
-                            <el-select
-                                v-model="form.keeperUserId"
-                                filterable
-                                placeholder="请选择库管员"
-                                style="width: 100%"
-                            >
-                                <el-option
-                                    v-for="keeper in keeperList"
-                                    :key="keeper.userId"
-                                    :label="keeper.userName"
-                                    :value="keeper.userId"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="维修班组">
-                            <el-select
-                                v-model="form.keeperUserId"
-                                filterable
-                                placeholder="请选择维修班组"
-                                style="width: 100%"
-                            >
-                                <el-option
-                                    v-for="keeper in keeperList"
-                                    :key="keeper.userId"
-                                    :label="keeper.userName"
-                                    :value="keeper.userId"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <template>    
-                <el-button v-if="this.title=='新增' || this.title=='修改'" type="primary" @click="submitForm">确 定</el-button>
-                </template>
-                           
-                <el-button  @click="cancel" >取 消</el-button>            
-                
-                <!-- <el-button @click="cancel">取 消</el-button> -->
-            </div>
-        </el-dialog>
-
-        <el-dialog :visible.sync="dialogVisible">
-            <img width="100%" height="650px" :src="dialogImageUrl" alt />
-        </el-dialog>
-
-
-        <!-- 新增弹框 -->
-        <el-dialog
-            :title="addTitle"
-            :visible.sync="addTitleVisible"
-            v-if="addTitleVisible"
-            width="50%"
-            append-to-body
-            :close-on-click-modal="false"
-        >
-            <el-form
-                label-width="80px"
-                :model="addFormParams"
-                :rules="addFormParamsRules"
-                ref="addFormParamsRef"
+        <el-row>
+          <el-col :span="6">
+            <el-form-item
+              label="购置价(元/含税)"
+              prop="name3"
+              label-width="120px"
             >
-                <el-row :gutter="24">
-                    <el-col :span="12" v-if="addTitle === '新增'">
-                        <el-form-item label="所属上级">
-                            <el-input
-                                style="width: 100%"
-                                disabled
-                                v-model="addFormParams.label"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="名称" prop="typeName">
-                            <el-input
-                                style="width: 100%"
-                                v-model="addFormParams.typeName"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+              <el-input
+                v-model="form.name3"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="赔偿价(元)" prop="name2" label-width="120px">
+              <el-input
+                v-model="form.name2"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="租赁价(元/天)"
+              prop="name1"
+              label-width="120px"
+            >
+              <el-input
+                v-model="form.name1"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 160px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="购置价(元/不含税)"
+              prop="name10"
+              label-width="130px"
+            >
+              <el-input
+                v-model="form.name10"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 160px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row style="text-align: right">
-                    <el-form-item>
-                        <el-button size="small" type="primary" @click="onSubmit"
-                            >确 定</el-button
-                        >
-                        <el-button size="small" @click="onCancel"
-                            >取 消</el-button
-                        >
-                    </el-form-item>
-                </el-row>
-            </el-form>
-        </el-dialog>
-    </div>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="管理模式" prop="manageType">
+              <el-select
+                v-model="form.manageType"
+                filterable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option value="0" label="编码管理">编码管理</el-option>
+                <el-option value="1" label="数量管理">数量管理</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否扣税" prop="isCharging">
+              <el-select
+                v-model="form.isCharging"
+                filterable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option value="0" label="扣税">扣税</el-option>
+                <el-option value="1" label="不扣税">不扣税</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="检验周期" prop="testCycle">
+              <el-input
+                v-model="form.testCycle"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 150px"
+              />
+              <span style="color: black">月</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="抽检比例(%)" prop="name11">
+              <el-input
+                v-model="form.name11"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item
+              label="核定载荷(T/MPa)"
+              prop="ratedLoad"
+              label-width="120px"
+            >
+              <el-input
+                v-model="form.ratedLoad"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 160px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="试验载荷(T/MPa)"
+              prop="testLoad"
+              label-width="130px"
+            >
+              <el-input
+                v-model="form.testLoad"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 160px"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="持荷时间(分)" prop="holdingTime">
+              <el-input
+                v-model="form.holdingTime"
+                placeholder="请输入"
+                maxlength="20"
+                style="width: 170px"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="库管员">
+              <el-select
+                v-model="form.keeperUserId"
+                filterable
+                placeholder="请选择库管员"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="keeper in keeperList"
+                  :key="keeper.userId"
+                  :label="keeper.userName"
+                  :value="keeper.userId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="维修班组">
+              <el-select
+                v-model="form.keeperUserId"
+                filterable
+                placeholder="请选择维修班组"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="keeper in keeperList"
+                  :key="keeper.userId"
+                  :label="keeper.userName"
+                  :value="keeper.userId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <template>
+          <el-button
+            v-if="this.title == '新增' || this.title == '修改'"
+            type="primary"
+            @click="submitForm"
+            >确 定</el-button
+          >
+        </template>
+
+        <el-button @click="cancel">取 消</el-button>
+
+        <!-- <el-button @click="cancel">取 消</el-button> -->
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt />
+    </el-dialog>
+
+    <!-- 新增弹框 -->
+    <el-dialog
+      :title="addTitle"
+      :visible.sync="addTitleVisible"
+      v-if="addTitleVisible"
+      width="50%"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        label-width="80px"
+        :model="addFormParams"
+        :rules="addFormParamsRules"
+        ref="addFormParamsRef"
+      >
+        <el-row :gutter="24">
+          <el-col :span="12" v-if="addTitle === '新增'">
+            <el-form-item label="所属上级">
+              <el-input
+                style="width: 100%"
+                disabled
+                v-model="addFormParams.label"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="名称" prop="typeName">
+              <el-input style="width: 100%" v-model="addFormParams.typeName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row style="text-align: right">
+          <el-form-item>
+            <el-button size="small" type="primary" @click="onSubmit"
+              >确 定</el-button
+            >
+            <el-button size="small" @click="onCancel">取 消</el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { getMaTypeList,getListByMaType,getMaType,queryKeeperDataApi,queryKeeperProApi,queryKeeperMatApi,queryKeeperNameApi,
-         delMaType,addMaType,updateMaType
-        } from '@/api/ma/base'
-import { imgUpLoad, } from '@/api/system/upload'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {
+  getMaTypeList,
+  getListByMaType,
+  getMaType,
+  queryKeeperDataApi,
+  queryKeeperProApi,
+  queryKeeperMatApi,
+  queryKeeperNameApi,
+  delMaType,
+  addMaType,
+  updateMaType,
+} from "@/api/ma/base";
+import { imgUpLoad } from "@/api/system/upload";
 
 export default {
-    name: 'ToolsType',
-    components: { Treeselect },
-    data() {
+  name: "ToolsType",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库管员用户数据
+      keeperList: null,
+      keeperDataRange: [],
+      //维修员用户数据
+      repairUserList: null,
+      //资产类型数据
+      propList: null,
+      // 类型名称
+      typeName: undefined,
+      // 树选项
+      treeOptions: undefined,
+      treeTemp: [],
+      treeTempTwo: [],
+      //列表数据
+      typeList: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 弹出层标题
+      title: "",
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {
+        companyId: "",
+      },
+      chosenTypeId: "",
+      leasePrice: "",
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl: "",
+      imageName: "",
+      fileList: [],
+      field101fileList: [],
+      levelTemp: undefined,
+      idTemp: undefined,
+      parentId: undefined,
+      level2Temp: undefined,
+      level2TempName: undefined,
+      level1TempName: undefined,
+      level0TempName: undefined,
+      level1Temp: undefined,
+      uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+      defaultProps: {
+        children: "children",
+        label: "label",
+      },
+
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        typeName: undefined,
+        level: 0,
+        // phonenumber: undefined,
+        // status: undefined,
+        // typeId: undefined
+      },
+
+      // 表单校验
+      rules: {
+        leasePrice: [
+          {
+            required: true,
+            message: "规格型号不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      companyId: undefined,
+      dialogImageUrl: "",
+      dialogVisible: false,
+      configOpen: false,
+      cform: {
+        price: "",
+        afterPrice: "",
+        useDate: "",
+      },
+
+      /* 新增弹框等数据源定义 */
+      addTitleVisible: false,
+      addTitle: "", // 新增弹框标题
+      addFormParams: {
+        label: "",
+        typeName: "",
+        companyId: 101,
+      },
+
+      addFormParamsRules: {
+        typeName: [
+          {
+            required: true,
+            message: "名称不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      isMousemoveId: null,
+      isLevel1Disabled: false,
+      isLevel2Disabled: false,
+      isLevel3Disabled: false,
+      isLevel4Disabled: false,
+    };
+  },
+  watch: {
+    // 根据名称筛选部门树
+    typeName(val) {
+      this.$refs.tree.filter(val);
+    },
+  },
+  created() {
+    this.getTreeData();
+    // this.getList()
+  },
+  methods: {
+    /** 查询物资类型 */
+    async getKeeperDataList(data) {
+      let keepdataRes = await queryKeeperDataApi({
+        // typeId:data.keeperData
+      });
+      this.keeperDataRange = keepdataRes.data.map((item) => {
         return {
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 库管员用户数据
-            keeperList: null,
-            keeperDataRange: [],
-            //维修员用户数据
-            repairUserList: null,
-            //资产类型数据
-            propList: null,
-            // 类型名称
-            typeName: undefined,
-            // 树选项
-            treeOptions: undefined,
-            treeTemp:[],
-            treeTempTwo:[],
-            //列表数据
-            typeList: undefined,
-            // 是否显示弹出层
-            open: false,
-            // 弹出层标题
-            title: '',
-            // 默认密码
-            initPassword: undefined,
-            // 日期范围
-            dateRange: [],
-            // 岗位选项
-            postOptions: [],
-            // 角色选项
-            roleOptions: [],
-            // 表单参数
-            form: {
-                companyId: '',
-            },
-            chosenTypeId: '',
-            leasePrice: '',
-            uploadHeader: process.env.VUE_APP_BASE_API,
-            imageUrl: '',
-            imageName: '',
-            fileList: [],
-            field101fileList: [],
-            levelTemp:undefined,
-            idTemp:undefined,
-            parentId:undefined,
-            level2Temp:undefined,
-            level2TempName:undefined,
-            level1TempName:undefined,
-            level0TempName:undefined,
-            level1Temp:undefined,
-            uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
-            defaultProps: {
-                children: 'children',
-                label: 'label',
-            },
+          label: item.houseName,
+          value: item.houseId,
+        };
+      });
+      this.form.keeperData = this.keeperDataRange.value;
+    },
 
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                typeName: undefined,
-                level: 0,
-                // phonenumber: undefined,
-                // status: undefined,
-                // typeId: undefined
-            },
-
-            // 表单校验
-            rules: {
-                leasePrice: [
-                    {
-                        required: true,
-                        message: '规格型号不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-
-            },
-            companyId: undefined,
-            dialogImageUrl: '',
-            dialogVisible: false,
-            configOpen: false,
-            cform: {
-                price: '',
-                afterPrice: '',
-                useDate: '',
-            },
-
-            /* 新增弹框等数据源定义 */
-            addTitleVisible: false,
-            addTitle: '', // 新增弹框标题
-            addFormParams: {
-                label: '',
-                typeName: '',
-                companyId: 101,
-            },
-
-            addFormParamsRules: {
-                typeName: [
-                    {
-                        required: true,
-                        message: '名称不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-            },
-            isMousemoveId: null,
-            isLevel1Disabled:false,
-            isLevel2Disabled:false,
-            isLevel3Disabled:false,
-            isLevel4Disabled:false,
+    /** 查询新增页面-上级类型下拉树结构 */
+    getTreeData() {
+      getMaTypeList().then((response) => {
+        this.treeOptions = response.data;
+        if (
+          this.treeOptions.length > 0 &&
+          this.treeOptions[0].children.length > 0
+        ) {
+          const firstNode = this.treeOptions[0].children[0];
+          this.queryParams.typeId = firstNode.id;
+          this.queryParams.level = 1;
+          this.queryParams.houseId = firstNode.houseId;
+          this.getList();
         }
+      });
     },
-    watch: {
-        // 根据名称筛选部门树
-        typeName(val) {
-            this.$refs.tree.filter(val)
-        },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      getListByMaType(this.queryParams).then((response) => {
+        this.typeList = response.data.rows;
+        this.total = response.data.total;
+        this.loading = false;
+      });
     },
-    created() {
-        this.getTreeData()
-        // this.getList()
+    // 筛选节点 - 左侧树
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
     },
-    methods: {
-
-        /** 查询物资类型 */
-       async getKeeperDataList(data) {
-           let keepdataRes =  await queryKeeperDataApi({
-                // typeId:data.keeperData
-            });
-            this.keeperDataRange = keepdataRes.data.map((item) => {
-                return {
-                label: item.houseName,
-                value: item.houseId,
-                };
-            });
-            this.form.keeperData = this.keeperDataRange.value
-        },
-
-        /** 查询新增页面-上级类型下拉树结构 */
-        getTreeData() {
-            getMaTypeList().then((response) => {
-                this.treeOptions = response.data
-            if(this.treeOptions.length>0 && this.treeOptions[0].children.length>0){
-              const firstNode = this.treeOptions[0].children[0];
-              this.queryParams.typeId = firstNode.id
-              this.queryParams.level = 1
-              this.queryParams.houseId = firstNode.houseId
+    // 节点单击事件 - 左侧树
+    async handleNodeClick(data, node) {
+      if (data.level == 0) {
+        this.queryParams.typeId = data.id;
+        this.queryParams.level = data.level;
+        this.queryParams.houseId = data.id;
+      } else {
+        this.queryParams.typeId = data.id;
+        this.queryParams.level = data.level;
+        this.queryParams.houseId = data.houseId;
+      }
+      this.handleQuery();
+      if (node.level == 1) {
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = false;
+        this.isLevel3Disabled = false;
+        this.isLevel4Disabled = false;
+        this.form.keeperData = data.id;
+      } else if (node.level == 2) {
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = false;
+        this.isLevel4Disabled = false;
+        this.form.keeperDataPro = data.id;
+      } else if (node.level == 3) {
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = true;
+        this.isLevel4Disabled = false;
+        this.form.keeperDataPro = data.id;
+        this.form.keeperDataMat = data.id;
+      } else if (node.level == 4) {
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = true;
+        this.isLevel4Disabled = true;
+        this.form.keeperDataPro = data.id;
+        this.form.keeperDataMat = data.id;
+      }
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        photoUrl: "",
+        photoName: "",
+        documentUrl: "",
+        documentName: "",
+        parentId: "",
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.queryParams.typeId = undefined;
+      this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
+      this.queryParams.level = 0;
+      this.$refs.tree.setCurrentKey(null);
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.typeId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增";
+    },
+    //查看
+    handleView(row) {
+      this.reset();
+      const typeId = row.typeId;
+      getMaType(typeId).then((response) => {
+        this.form = response.data;
+        this.form.isCharging = this.form.isCharging + "";
+        this.form.houseName = row.houseName;
+        this.form.itemType = row.itemType;
+        this.form.materialType = row.materialType;
+        this.form.materialName = row.materialName;
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = true;
+        this.isLevel4Disabled = true;
+        this.open = true;
+        this.title = "查看";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const typeId = row.typeId;
+      getMaType(typeId).then((response) => {
+        this.form = response.data;
+        this.form.isCharging = this.form.isCharging + "";
+        this.form.houseName = row.houseName;
+        this.form.itemType = row.itemType;
+        this.form.materialType = row.materialType;
+        this.form.materialName = row.materialName;
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = true;
+        this.isLevel4Disabled = true;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      console.log(this.form, "提交参数---");
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.typeId != undefined) {
+            updateMaType(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
               this.getList();
-            }
-            })
-        },
-        /** 查询列表 */
-        getList() {
-            this.loading = true
-            getListByMaType(this.queryParams).then((response) => {
-                this.typeList = response.data.rows
-                this.total = response.data.total
-                this.loading = false
-            })
-        },
-        // 筛选节点 - 左侧树
-        filterNode(value, data) {
-            if (!value) return true
-            return data.label.indexOf(value) !== -1
-        },
-        // 节点单击事件 - 左侧树
-      async  handleNodeClick(data,node) {
-          if(data.level==0){
-          this.queryParams.typeId = data.id
-          this.queryParams.level = data.level
-          this.queryParams.houseId = data.id
-          }else{
-          this.queryParams.typeId = data.id
-          this.queryParams.level = data.level
-          this.queryParams.houseId = data.houseId
+              this.getTreeData();
+            });
+          } else {
+            // this.form.companyId = this.companyId
+            addMaType(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+              this.getTreeData();
+            });
           }
-            this.handleQuery()
-            if(node.level==1){
-                this.isLevel1Disabled=true
-                this.isLevel2Disabled=false
-                this.isLevel3Disabled=false
-                this.isLevel4Disabled=false
-                this.form.keeperData = data.id
-            }else if(node.level==2){
-                 this.isLevel1Disabled=true
-                 this.isLevel2Disabled=true
-                 this.isLevel3Disabled=false
-                 this.isLevel4Disabled=false
-                 this.form.keeperDataPro = data.id
-            }else if(node.level==3){
-                 this.isLevel1Disabled=true
-                 this.isLevel2Disabled=true
-                 this.isLevel3Disabled=true
-                 this.isLevel4Disabled=false
-                 this.form.keeperDataPro = data.id
-                 this.form.keeperDataMat = data.id
-            }else if(node.level==4){
-                 this.isLevel1Disabled=true
-                 this.isLevel2Disabled=true
-                 this.isLevel3Disabled=true
-                 this.isLevel4Disabled=true
-                 this.form.keeperDataPro = data.id
-                 this.form.keeperDataMat = data.id
-            }
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false
-            this.reset()
-        },
-        // 表单重置
-        reset() {
-            this.form = {
-                photoUrl: '',
-                photoName: '',
-                documentUrl: '',
-                documentName: '',
-                parentId: '',
-            }
-            this.resetForm('form')
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            // this.queryParams.pageNum = 1;
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.dateRange = []
-            this.resetForm('queryForm')
-            this.queryParams.typeId = undefined
-            this.queryParams.pageNum = 1
-            this.queryParams.pageSize = 10
-            this.queryParams.level = 0
-            this.$refs.tree.setCurrentKey(null)
-            this.handleQuery()
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map((item) => item.typeId)
-            this.single = selection.length != 1
-            this.multiple = !selection.length
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.reset()
-            this.open = true
-            this.title = '新增'
-        },
-        //查看
-        handleView(row) {
-            this.reset()
-            const typeId = row.typeId 
-            getMaType(typeId).then((response) => {
-                this.form = response.data;
-                this.form.isCharging = this.form.isCharging + ''
-                this.form.houseName = row.houseName
-                this.form.itemType = row.itemType
-                this.form.materialType = row.materialType
-                this.form.materialName = row.materialName
-                this.isLevel1Disabled=true
-                this.isLevel2Disabled=true
-                this.isLevel3Disabled=true
-                this.isLevel4Disabled=true
-                this.open = true
-                this.title = '查看'
-            })
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.reset()
-            const typeId = row.typeId 
-            getMaType(typeId).then((response) => {
-                this.form = response.data;
-                this.form.isCharging = this.form.isCharging + ''
-                this.form.houseName = row.houseName
-                this.form.itemType = row.itemType
-                this.form.materialType = row.materialType
-                this.form.materialName = row.materialName
-                this.isLevel1Disabled=true
-                this.isLevel2Disabled=true
-                this.isLevel3Disabled=true
-                this.isLevel4Disabled=true
-                this.open = true
-                this.title = '修改'
-            })
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            console.log(this.form, '提交参数---')
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    if (this.form.typeId != undefined) {
-                        updateMaType(this.form).then((response) => {
-                            this.$modal.msgSuccess('修改成功')
-                            this.open = false
-                            this.getList()
-                            this.getTreeData()
-                        })
-                    } else {
-                        // this.form.companyId = this.companyId
-                        addMaType(this.form).then((response) => {
-                            this.$modal.msgSuccess('新增成功')
-                            this.open = false
-                            this.getList()
-                            this.getTreeData()
-                        })
-                    }
-                }
-            })
-        },
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            const typeId = row.typeId
-            this.$modal
-                .confirm('是否确认删除数据项？')
-                .then(function () {
-                    return delMaType(typeId)
-                })
-                .then(() => {
-                    this.$modal.msgSuccess('删除成功')
-                    this.getList()
-                    this.getTreeData()
-                })
-                .catch(() => {})
-        },
-
-        handleRemove(file, fileList) {
-            console.log(file, fileList)
-            this.imageUrl = ''
-            this.form.photoUrl = ''
-            this.form.photoName = ''
-        },
-
-        
-
-
-        /** 导出按钮操作 */
-        // handleExport() {
-        //     // this.download('system/user/export', {
-        //     //   ...this.queryParams
-        //     // }, `user_${new Date().getTime()}.xlsx`)
-        // exportMaterial(this.queryParams).then(res => {
-        //     downloadFile({ fileName: `物资类型信息_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
-        //   })
-        // },
-        /** 导出按钮操作 */
-        handleExport() {
-            let queryTemp = this.queryParams;
-            queryTemp.level = 0;
-            this.download('/material/ma_type/export', {
-              ...queryTemp
-            }, `物资类型信息_${new Date().getTime()}.xlsx`)
-        },
-        /* 树节点操作 */
-        treeChange(val) {
-            console.log(val, '树节点')
-
-            this.form.companyId = val.companyId
-        },
-
-        /* 树节点增加 */
-        appendTreeNode(data) {
-            this.levelTemp = data.level;
-            this.idTemp = data.id;
-            console.log('dataAdd',data)
-            console.log('idTemp',data)
-            if (data.level === 3) {
-                this.reset()
-                Object.assign(this.form, data)
-                this.treeTemp=this.treeOptions[0].children,
-                this.treeTemp.forEach(item=>{
-                    item.children.forEach(itemTemp=>{
-                    if(itemTemp.level==2 && itemTemp.id==data.parentId){
-                        this.level2Temp=itemTemp.id
-                        this.level2TempName=itemTemp.label
-                        this.level1Temp=itemTemp.parentId
-                    }
-                    })
-                })
-                //  console.log('treeTemp',this.treeTemp)
-                this.treeTemp.forEach(item=>{
-                    if(item.level==1 && item.id==this.level1Temp){
-                        this.level1TempName=item.label
-                    }
-                })
-                this.treeTemp.forEach(item=>{
-                    if(item.level==0 && item.id==data.houseId){
-                        this.level0TempName=item.label
-                    }
-                })
-                this.isLevel1Disabled=true
-                this.isLevel2Disabled=true
-                this.isLevel3Disabled=true
-                this.isLevel4Disabled=true
-                this.form.parentId = data.id
-                this.form.houseName = this.level0TempName
-                this.form.itemType = this.level1TempName
-                this.form.materialType = this.level2TempName
-                this.form.materialName = data.label
-                this.open = true
-                this.title = '新增'
-            } else {
-                Object.assign(this.addFormParams, data)
-                this.addFormParams.typeName = ''
-                this.addTitle = '新增'
-                this.addTitleVisible = true
-            }
-        },
-        /* 树节点删除 */
-        removeTreeNode(data) {
-            // this.$message.success('删除--')
-            console.log(data, '删除时的数据源--')
-            const typeId = data.id
-            this.$modal
-                .confirm('是否确认删除数据项？')
-                .then(function () {
-                    return delMaType(typeId)
-                })
-                .then(() => {
-                    this.$modal.msgSuccess('删除成功')
-                    this.getTreeData()
-                })
-                .catch(() => {})
-        },
-        /* 树节点修改 */
-        editTreeNode(data) {
-            this.levelTemp = data.level;
-            this.idTemp = data.id;
-            this.parentId = data.parentId;
-            console.log('data',data)
-            Object.assign(this.addFormParams, data)
-            this.addTitle = '修改'
-            this.addFormParams.typeName = data.label
-            this.addTitleVisible = true
-        },
-        /* 确定 */
-        onSubmit() {
-            const { id, typeName } = this.addFormParams
-            console.log('level',this.levelTemp)
-            console.log('idTemp',this.idTemp)
-            const addParams = {
-                parentId: this.levelTemp==0 ? 0:this.idTemp,
-                typeName,
-                level:this.levelTemp,
-                houseId:this.levelTemp==0 ? id:null,
-            }
-            
-            const editParams = {
-                houseId: id,
-                typeName,
-                level:this.levelTemp,
-                parentId: this.parentId,
-                typeId: id,
-            }
-    
-
-            this.$refs['addFormParamsRef'].validate(async (valid) => {
-                if (valid) {
-                    if (this.addTitle === '新增') {
-                        const res = await addMaType(addParams)
-                        if (res.code === 200) {
-                            this.$message.success('新增成功！')
-                            this.addTitleVisible = false
-                            this.getList()
-                            this.getTreeData()
-                        }
-                    } else {
-                        const res = await updateMaType(editParams)
-                        if (res.code === 200) {
-                            this.$message.success('修改成功！')
-                            this.addTitleVisible = false
-                            this.getList()
-                            this.getTreeData()
-                        }
-                    }
-                }
-            })
-        },
-        /* 取消 */
-        onCancel() {
-            this.addTitleVisible = false
-        },
-        getParentName(list, id) {
-            try {
-                list.forEach((e) => {
-                    if (e.id == id) {
-                        this.form.label = e.label
-                        throw new Error()
-                    } else {
-                        if (e.children && e.children.length > 0) {
-                            this.getParentName(e.children, id)
-                        }
-                    }
-                })
-            } catch (error) {}
-        },
-
-        onMousemove(data) {
-            this.isMousemoveId = data.id
-        },
-        onMouseleave() {
-            this.isMousemoveId = null
-        },
+        }
+      });
     },
-}
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const typeId = row.typeId;
+      this.$modal
+        .confirm("是否确认删除数据项？")
+        .then(function () {
+          return delMaType(typeId);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getList();
+          this.getTreeData();
+        })
+        .catch(() => {});
+    },
+
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.imageUrl = "";
+      this.form.photoUrl = "";
+      this.form.photoName = "";
+    },
+
+    /** 导出按钮操作 */
+    // handleExport() {
+    //     // this.download('system/user/export', {
+    //     //   ...this.queryParams
+    //     // }, `user_${new Date().getTime()}.xlsx`)
+    // exportMaterial(this.queryParams).then(res => {
+    //     downloadFile({ fileName: `物资类型信息_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+    //   })
+    // },
+    /** 导出按钮操作 */
+    handleExport() {
+      let queryTemp = this.queryParams;
+      queryTemp.level = 0;
+      this.download(
+        "/material/ma_type/export",
+        {
+          ...queryTemp,
+        },
+        `物资类型信息_${new Date().getTime()}.xlsx`
+      );
+    },
+    /* 树节点操作 */
+    treeChange(val) {
+      console.log(val, "树节点");
+
+      this.form.companyId = val.companyId;
+    },
+
+    /* 树节点增加 */
+    appendTreeNode(data) {
+      this.levelTemp = data.level;
+      this.idTemp = data.id;
+      console.log("dataAdd", data);
+      console.log("idTemp", data);
+      if (data.level === 3) {
+        this.reset();
+        Object.assign(this.form, data);
+        (this.treeTemp = this.treeOptions[0].children),
+          this.treeTemp.forEach((item) => {
+            item.children.forEach((itemTemp) => {
+              if (itemTemp.level == 2 && itemTemp.id == data.parentId) {
+                this.level2Temp = itemTemp.id;
+                this.level2TempName = itemTemp.label;
+                this.level1Temp = itemTemp.parentId;
+              }
+            });
+          });
+        //  console.log('treeTemp',this.treeTemp)
+        this.treeTemp.forEach((item) => {
+          if (item.level == 1 && item.id == this.level1Temp) {
+            this.level1TempName = item.label;
+          }
+        });
+        this.treeTemp.forEach((item) => {
+          if (item.level == 0 && item.id == data.houseId) {
+            this.level0TempName = item.label;
+          }
+        });
+        this.isLevel1Disabled = true;
+        this.isLevel2Disabled = true;
+        this.isLevel3Disabled = true;
+        this.isLevel4Disabled = true;
+        this.form.parentId = data.id;
+        this.form.houseName = this.level0TempName;
+        this.form.itemType = this.level1TempName;
+        this.form.materialType = this.level2TempName;
+        this.form.materialName = data.label;
+        this.open = true;
+        this.title = "新增";
+      } else {
+        Object.assign(this.addFormParams, data);
+        this.addFormParams.typeName = "";
+        this.addTitle = "新增";
+        this.addTitleVisible = true;
+      }
+    },
+    /* 树节点删除 */
+    removeTreeNode(data) {
+      // this.$message.success('删除--')
+      console.log(data, "删除时的数据源--");
+      const typeId = data.id;
+      this.$modal
+        .confirm("是否确认删除数据项？")
+        .then(function () {
+          return delMaType(typeId);
+        })
+        .then(() => {
+          this.$modal.msgSuccess("删除成功");
+          this.getTreeData();
+        })
+        .catch(() => {});
+    },
+    /* 树节点修改 */
+    editTreeNode(data) {
+      this.levelTemp = data.level;
+      this.idTemp = data.id;
+      this.parentId = data.parentId;
+      console.log("data", data);
+      Object.assign(this.addFormParams, data);
+      this.addTitle = "修改";
+      this.addFormParams.typeName = data.label;
+      this.addTitleVisible = true;
+    },
+    /* 确定 */
+    onSubmit() {
+      const { id, typeName } = this.addFormParams;
+      console.log("level", this.levelTemp);
+      console.log("idTemp", this.idTemp);
+      const addParams = {
+        parentId: this.levelTemp == 0 ? 0 : this.idTemp,
+        typeName,
+        level: this.levelTemp,
+        houseId: this.levelTemp == 0 ? id : null,
+      };
+
+      const editParams = {
+        houseId: id,
+        typeName,
+        level: this.levelTemp,
+        parentId: this.parentId,
+        typeId: id,
+      };
+
+      this.$refs["addFormParamsRef"].validate(async (valid) => {
+        if (valid) {
+          if (this.addTitle === "新增") {
+            const res = await addMaType(addParams);
+            if (res.code === 200) {
+              this.$message.success("新增成功！");
+              this.addTitleVisible = false;
+              this.getList();
+              this.getTreeData();
+            }
+          } else {
+            const res = await updateMaType(editParams);
+            if (res.code === 200) {
+              this.$message.success("修改成功！");
+              this.addTitleVisible = false;
+              this.getList();
+              this.getTreeData();
+            }
+          }
+        }
+      });
+    },
+    /* 取消 */
+    onCancel() {
+      this.addTitleVisible = false;
+    },
+    getParentName(list, id) {
+      try {
+        list.forEach((e) => {
+          if (e.id == id) {
+            this.form.label = e.label;
+            throw new Error();
+          } else {
+            if (e.children && e.children.length > 0) {
+              this.getParentName(e.children, id);
+            }
+          }
+        });
+      } catch (error) {}
+    },
+
+    onMousemove(data) {
+      this.isMousemoveId = data.id;
+    },
+    onMouseleave() {
+      this.isMousemoveId = null;
+    },
+  },
+};
 </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 .btn-items .el-button + .el-button {
-    margin-left: 6px;
+  margin-left: 6px;
 }
 .btn-items {
-    margin-left: 4px;
-    .el-button--text {
-        font-size: 16px;
-    }
+  margin-left: 4px;
+  .el-button--text {
+    font-size: 16px;
+  }
 }
 ::v-deep .el-tree .el-tree-node__expand-icon.expanded {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
+  -webkit-transform: rotate(0deg);
+  transform: rotate(0deg);
 }
 ::v-deep .el-tree .el-icon-caret-right:before {
-    content: '\e783';
-    font-size: 16px;
+  content: "\e783";
+  font-size: 16px;
 }
 ::v-deep
-    .el-tree
-    .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
-    content: '\e781';
-    font-size: 16px;
-    color: #1890ff;
+  .el-tree
+  .el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
+  content: "\e781";
+  font-size: 16px;
+  color: #1890ff;
 }
 
 ::v-deep .el-tree-node__content > .el-tree-node__expand-icon {
-    color: #1890ff !important;
+  color: #1890ff !important;
 }
 ::v-deep .el-tree-node__expand-icon.is-leaf {
-    color: transparent !important;
+  color: transparent !important;
 }
 
 ::v-deep
-    .el-tree--highlight-current
-    .el-tree-node.is-current
-    > .el-tree-node__content {
-    background-color: #8decf1;
+  .el-tree--highlight-current
+  .el-tree-node.is-current
+  > .el-tree-node__content {
+  background-color: #8decf1;
 }
 </style>
diff --git a/src/views/material/purchase/goodsArrived/component/home.vue b/src/views/material/purchase/goodsArrived/component/home.vue
index 2dd792de..9c4c6927 100644
--- a/src/views/material/purchase/goodsArrived/component/home.vue
+++ b/src/views/material/purchase/goodsArrived/component/home.vue
@@ -1,182 +1,179 @@
 <template>
-    <div>
-        <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-            label-width="100px"
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item label="日期">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 240px"
         >
-            <el-form-item label="日期">
-                <el-date-picker
-                    v-model="queryParams.time"
-                    type="daterange"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    style="width: 240px"
-                >
-                </el-date-picker>
-            </el-form-item>
+        </el-date-picker>
+      </el-form-item>
 
-            <el-form-item label="设备状态" prop="typeId">
-                <el-select
-                    v-model="queryParams.typeId"
-                    placeholder="请选择设备状态"
-                    clearable
-                    filterable
-                    style="width: 240px"
-                >
-                    <el-option
-                        v-for="typeItem in typesList"
-                        :key="typeItem.typeId"
-                        :label="typeItem.typeName"
-                        :value="typeItem.typeId"
-                    />
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="关键字" prop="keyWord">
-                <el-input
-                    v-model="queryParams.keyWord"
-                    placeholder="请输入关键字"
-                    clearable
-                    maxlength="50"
-                    style="width: 240px"
-                    @keyup.enter.native="handleQuery"
-                />
-            </el-form-item>
-
-            <el-form-item>
-                <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                    >搜索</el-button
-                >
-                <el-button
-                    icon="el-icon-refresh"
-                    size="mini"
-                    @click="resetQuery"
-                    >重置</el-button
-                >
-            </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button
-                    type="primary"
-                    plain
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="handleAdd"
-                    v-hasPermi="['purchase:info:add']"
-                    >设备到货新增</el-button
-                >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="warning"
-                    plain
-                    icon="el-icon-download"
-                    size="mini"
-                    @click="handleExport"
-                    >导出</el-button
-                >
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-        </el-row>
-
-        <el-table
-            v-loading="loading"
-            :data="typeList"
-            row-key="id"
-            border
+      <el-form-item label="设备状态" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择设备状态"
+          clearable
+          filterable
+          style="width: 240px"
         >
-            <!-- <el-table-column type="selection" width="55" align="center" /> -->
-            <el-table-column width="60"
-                align="center"
-                label="序号"
-                type="index"
-            />
-            <el-table-column
-                align="center" width="160"
-                label="到货时间"
-                prop="arrivalTime"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="采购单号" width="150"
-                align="center" 
-                prop="code"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="采购物资"
-                align="center"
-                prop="purchaseMaTypeName"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="采购数量"
-                align="center"
-                prop="purchaseMaNumber"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="采购价格(元含税)"
-                align="center"
-                prop="purchaseTaxPrice"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="采购价格(元不含税)"
-                align="center"
-                prop="purchasePrice"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column
-                label="税率"
-                align="center"
-                prop="taxRate"
-                :show-overflow-tooltip="true"
-            >
-            </el-table-column>
+          <el-option
+            v-for="typeItem in typesList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
 
-            <el-table-column
-                label="物资厂家"
-                align="center"
-                prop="supplier"
-                :show-overflow-tooltip="true"
-            />
+      <el-form-item label="关键字" prop="keyWord">
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 
-            
-            <el-table-column
-                label="操作人"
-                align="center"
-                prop="createBy"
-                :show-overflow-tooltip="true"
-            />
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
 
-            
-            <el-table-column
-                label="操作时间"
-                align="center" width="160"
-                prop="createTime"
-                :show-overflow-tooltip="true"
-            />
-            <el-table-column label="状态" align="center" prop="taskStatus" :show-overflow-tooltip="true">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.purchase_task_status" :value="scope.row.taskStatus"/>
-                </template>
-                <!-- <template slot-scope="scope">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['purchase:info:add']"
+          >设备到货新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >导出</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList" row-key="id" border>
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column width="60" align="center" label="序号" type="index" />
+      <el-table-column
+        align="center"
+        width="160"
+        label="到货时间"
+        prop="arrivalTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购单号"
+        width="150"
+        align="center"
+        prop="code"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购物资"
+        align="center"
+        prop="purchaseMaTypeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购数量"
+        align="center"
+        prop="purchaseMaNumber"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购价格(元含税)"
+        align="center"
+        prop="purchaseTaxPrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="采购价格(元不含税)"
+        align="center"
+        prop="purchasePrice"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="税率"
+        align="center"
+        prop="taxRate"
+        :show-overflow-tooltip="true"
+      >
+      </el-table-column>
+
+      <el-table-column
+        label="物资厂家"
+        align="center"
+        prop="supplier"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="操作人"
+        align="center"
+        prop="createBy"
+        :show-overflow-tooltip="true"
+      />
+
+      <el-table-column
+        label="操作时间"
+        align="center"
+        width="160"
+        prop="createTime"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="taskStatus"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.purchase_task_status"
+            :value="scope.row.taskStatus"
+          />
+        </template>
+        <!-- <template slot-scope="scope">
                     <span v-if="scope.row.taskStatus==0">待提交</span>
                     <span v-if="scope.row.taskStatus==1">待通知</span>
                     <span v-if="scope.row.taskStatus==2">待验收</span>
@@ -189,317 +186,341 @@
                     <span v-if="scope.row.taskStatus==9">入库进行中</span>
                     <span v-if="scope.row.taskStatus==10">未完成</span>
                 </template> -->
+      </el-table-column>
+
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="normal"
+            @click="handleView(scope.row)"
+            v-if="scope.row.taskStatus != 24"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['purchase:info:edit']"
+            >编辑</el-button
+          >
+
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="success"
+            @click="handleNotice(scope.row)"
+            v-hasPermi="['purchase:person:notice']"
+            >通知</el-button
+          >
+          <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
+            >验收单</el-button
+          >
+
+          <el-button
+            size="mini"
+            type="danger"
+            @click="handleDeletePurchase(scope.row)"
+            v-hasPermi="['purchase:info:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 验收单弹窗 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="openPrint"
+      width="1100px"
+      append-to-body
+    >
+      <div style="height: 500px; overflow-y: scroll">
+        <vue-easy-print tableShow ref="remarksPrintRef" class="print">
+          <div
+            class="title"
+            style="text-align: center; font-weight: 600; font-size: 16px"
+          >
+            机具设备到货验收单
+          </div>
+          <div
+            class="info"
+            style="margin-top: 10px; display: flex; flex-wrap: wrap"
+          >
+            <div
+              class="item"
+              style="
+                width: 100%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>单据编号：</span>
+            </div>
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>生产厂家（供应商）：</span>
+            </div>
+
+            <div
+              class="item"
+              style="
+                width: 50%;
+                flex-shrink: 0;
+                margin-bottom: 5px;
+                font-size: 14px;
+              "
+            >
+              <span>到货日期：</span>
+            </div>
+          </div>
+          <el-table
+            :data="printTableData"
+            class="table"
+            style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
+            border
+          >
+            <!--          <el-table-column type="selection" width="55" align="center" />-->
+            <el-table-column label="序号" align="center" type="index" row="2" />
+            <el-table-column
+              label="物资名称"
+              align="center"
+              prop="machineTypeName"
+            />
+            <el-table-column
+              label="规格型号"
+              align="center"
+              prop="specificationType"
+            />
+            <el-table-column label="单位" align="center" prop="unitName" />
+            <el-table-column label="配送信息" align="center">
+              <el-table-column
+                label="到货数量"
+                align="center"
+                prop="purchaseNum"
+              />
+              <el-table-column
+                label="验收结论"
+                align="center"
+                prop="purchaseNum"
+              />
+              <el-table-column label="质保质量" align="center">
+                <el-table-column
+                  label="实收份数"
+                  align="center"
+                  prop="purchaseNum"
+                />
+                <el-table-column
+                  label="符合要求"
+                  align="center"
+                  prop="purchaseNum"
+                />
+              </el-table-column>
             </el-table-column>
+            <el-table-column label="备注" align="center" prop="unitName" />
 
-            <el-table-column label="操作" align="center" width="250">
-                <template slot-scope="scope">
-                    <el-button
-                        size="mini" style="margin-bottom: 10px;"
-                        type="normal" 
-                        @click="handleView(scope.row)"
-                        v-if="scope.row.taskStatus != 24"
-                        >查看</el-button
-                    >
-                    <el-button
-                        size="mini" style="margin-bottom: 10px;"
-                        type="primary"
-                        @click="handleUpdate(scope.row)"
-                        v-hasPermi="['purchase:info:edit']"
-                        >编辑</el-button
-                    >
+            <!--                        <el-table-column-->
+            <!--                            label="合格证及技术资料"-->
+            <!--                            align="center"-->
+            <!--                            prop=""-->
+            <!--                        />-->
+            <!--                        <el-table-column label="包装" align="center" prop="" />-->
+          </el-table>
 
-                    <el-button
-                        size="mini" style="margin-bottom: 10px;"
-                        type="success"  
-                        @click="handleNotice(scope.row)"
-                        v-hasPermi="['purchase:person:notice']"
-                        >通知</el-button
-                    > 
-                    <el-button
-                        size="mini"
-                        type="warning"
-                        @click="handlePrint(scope.row)"
-                        >验收单</el-button
-                    >
+          <div
+            class="fillIn"
+            style="
+              margin-top: 20px;
+              display: flex;
+              justify-content: space-between;
+            "
+          >
+            <div class="item" style="width: 33%">
+              <div>
+                <span>供应科：</span>
+              </div>
+            </div>
 
-                    <el-button
-                        size="mini"
-                        type="danger"
-                        @click="handleDeletePurchase(scope.row)"
-                        v-hasPermi="['purchase:info:remove']"
-                        >删除</el-button
-                    >
-                </template>
-            </el-table-column>
-        </el-table>
+            <div class="item" style="width: 33%">
+              <div>
+                <span>生产技术科：</span>
+              </div>
+            </div>
 
-        <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
+            <div class="item" style="width: 33%">
+              <div>
+                <span>库管班：</span>
+              </div>
+            </div>
+          </div>
+        </vue-easy-print>
+      </div>
+
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="print">打 印</el-button>
+        <el-button @click="openPrint = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 通知弹窗 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="showPeople"
+      width="800px"
+      append-to-body
+      @close="cancel"
+    >
+      <el-row :gutter="24">
+        <el-col :span="20">
+          <el-form
+            :model="form"
+            ref="form"
+            size="small"
+            :inline="true"
+            :rules="rules"
+          >
+            <el-form-item label="通知内容:" prop="remark" label-width="100px">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                maxlength="100"
+                :autosize="{ minRows: 3, maxRows: 6 }"
+                placeholder="请输入通知内容"
+                style="width: 450px"
+              />
+            </el-form-item>
+          </el-form>
+        </el-col>
+      </el-row>
+
+      <el-table
+        :data="getListPeople"
+        width="600px"
+        height="450"
+        @selection-change="handleSelectionUser"
+      >
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"
+          :reserve-selection="true"
         />
-
-        <!-- 验收单弹窗 -->
-        <el-dialog
-            :title="title"
-            :visible.sync="openPrint"
-            width="1100px"
-            append-to-body
+        <el-table-column
+          label="人员名称"
+          align="center"
+          prop="userName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="所属机构"
+          align="center"
+          prop="deptName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="角色"
+          align="center"
+          prop="roleName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="联系电话"
+          align="center"
+          prop="telphone"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
         >
-            <div style="height: 500px; overflow-y: scroll">
-                <vue-easy-print tableShow ref="remarksPrintRef" class="print">
-                    <div
-                        class="title"
-                        style="
-                            text-align: center;
-                            font-weight: 600;
-                            font-size: 16px;
-                        "
-                    >
-                        机具设备到货验收单
-                    </div>
-                    <div
-                        class="info"
-                        style="margin-top: 10px; display: flex; flex-wrap: wrap"
-                    >
-                        <div
-                            class="item"
-                            style="
-                                width: 100%;
-                                flex-shrink: 0;
-                                margin-bottom: 5px;
-                                font-size: 14px;
-                            "
-                        >
-                            <span>单据编号：</span>
-                        </div>
-                        <div
-                            class="item"
-                            style="
-                                width: 50%;
-                                flex-shrink: 0;
-                                margin-bottom: 5px;
-                                font-size: 14px;
-                            "
-                        >
-                            <span>生产厂家（供应商）：</span>
-                        </div>
-
-                        <div
-                            class="item"
-                            style="
-                                width: 50%;
-                                flex-shrink: 0;
-                                margin-bottom: 5px;
-                                font-size: 14px;
-                            "
-                        >
-                            <span>到货日期：</span>
-                        </div>
-                    </div>
-                    <el-table
-                        :data="printTableData"
-                        class="table"
-                        style="
-                            margin-top: 20px;
-                            width: 1000px;
-                            padding-bottom: 1px;
-                        "
-                        border
-                    >
-                        <!--          <el-table-column type="selection" width="55" align="center" />-->
-                        <el-table-column
-                            label="序号"
-                            align="center"
-                            type="index"
-                            row=2
-                        />
-                        <el-table-column
-                            label="物资名称"
-                            align="center"
-                            prop="machineTypeName"
-                        />
-                        <el-table-column
-                            label="规格型号"
-                            align="center"
-                            prop="specificationType"
-                        />
-                        <el-table-column
-                            label="单位"
-                            align="center"
-                            prop="unitName"
-                        />
-                        <el-table-column label="配送信息" align="center">
-                          <el-table-column
-                            label="到货数量"
-                            align="center"
-                            prop="purchaseNum"
-                        />
-                           <el-table-column
-                            label="验收结论"
-                            align="center"
-                            prop="purchaseNum"
-                        />
-                           <el-table-column label="质保质量" align="center">
-                            <el-table-column
-                            label="实收份数"
-                            align="center"
-                            prop="purchaseNum"
-                        />
-                            <el-table-column
-                            label="符合要求"
-                            align="center"
-                            prop="purchaseNum"
-                        />
-                           </el-table-column>
-                        </el-table-column>
-                        <el-table-column
-                            label="备注"
-                            align="center"
-                            prop="unitName"
-                        />
-
-<!--                        <el-table-column-->
-<!--                            label="合格证及技术资料"-->
-<!--                            align="center"-->
-<!--                            prop=""-->
-<!--                        />-->
-<!--                        <el-table-column label="包装" align="center" prop="" />-->
-                    </el-table>
-
-                    <div
-                        class="fillIn"
-                        style="
-                            margin-top: 20px;
-                            display: flex;
-                            justify-content: space-between;
-                        "
-                    >
-                        <div class="item" style="width: 33%">
-                            <div>
-                                <span>供应科：</span>
-                            </div>
-                        </div>
-
-                        <div class="item" style="width: 33%">
-                            <div>
-                                <span>生产技术科：</span>
-                            </div>
-                        </div>
-
-                         <div class="item" style="width: 33%">
-                            <div>
-                                <span>库管班：</span>
-                            </div>
-                        </div>
-                    </div>
-                </vue-easy-print>
-            </div>
-
-            <div slot="footer" class="dialog-footer" style="text-align: center">
-                <el-button type="primary" @click="print">打 印</el-button>
-                <el-button @click="openPrint = false">关 闭</el-button>
-            </div>
-        </el-dialog>
-
-         <!-- 通知弹窗 -->
-      <el-dialog :title="title" :visible.sync="showPeople" width="800px" append-to-body @close="cancel">
-             <el-row :gutter="24">  
-             <el-col :span="20">
-              <el-form :model="form" ref="form" size="small" :inline="true" :rules="rules">
-                 <el-form-item label="通知内容:" prop="remark" label-width="100px">
-                    <el-input
-                        v-model="form.remark"
-                        type="textarea" maxlength="100"
-                        :autosize="{ minRows: 3, maxRows: 6 }"
-                        placeholder="请输入通知内容"
-                        style="width: 450px"
-                    />
-                </el-form-item>  
-             </el-form>
-             </el-col> 
-           </el-row> 
-
-      <el-table :data="getListPeople" width="600px" height="450" @selection-change="handleSelectionUser">
-        <el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
-        <el-table-column label="人员名称" align="center" prop="userName" :show-overflow-tooltip="true"/>
-        <el-table-column label="所属机构" align="center" prop="deptName" :show-overflow-tooltip="true"/>
-        <el-table-column label="角色" align="center" prop="roleName" :show-overflow-tooltip="true"/>
-        <el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="danger"
               @click="handleDeletePeople(scope.row)"
-            >删除</el-button>
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-        <div slot="footer" class="dialog-footer" style="text-align: center">
-            <el-button type="primary" @click="addUserOpen"
-                >人员添加</el-button
-            >
-            <el-button type="primary" @click="configNotice"
-                >发起验收</el-button
-            >
-        </div>
-      </el-dialog>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="addUserOpen">人员添加</el-button>
+        <el-button type="primary" @click="configNotice">发起验收</el-button>
+      </div>
+    </el-dialog>
 
-        <!--    人员添加  -->
-        <el-dialog
-            title="人员添加"
-            :visible.sync="peopleOpen"
-            v-if="peopleOpen"
-            width="1000px"
-            append-to-body
-        >
-            <el-table
-                v-loading="loading"
-                :data="userList"
-                @selection-change="handleSelectionAddUser"
-                height="450"
-            >
-                <el-table-column type="selection" width="50" align="center" />
-                <el-table-column label="序号" align="center" type="index" />
-                <el-table-column
-                    label="人员账号"
-                    align="center"
-                    key="userName"
-                    prop="userName"  width="120"
-                    :show-overflow-tooltip="true"
-                />
-                <el-table-column
-                    label="人员名称"
-                    align="center"
-                    key="nickName"
-                    prop="nickName" width="120"
-                    :show-overflow-tooltip="true"
-                />
-                <el-table-column
-                    label="所属机构"
-                    align="center"
-                    key="deptName"
-                    prop="deptName" 
-                    :show-overflow-tooltip="true"
-                />
-                <el-table-column
-                    label="角色"
-                    align="center"
-                    key="roleName"
-                    prop="roleName"
-                    :show-overflow-tooltip="true"
-                />
-                <el-table-column
-                    label="联系电话"
-                    align="center"
-                    key="telphone"
-                    prop="telphone"
-                    
-                />
-                <!-- <el-table-column
+    <!--    人员添加  -->
+    <el-dialog
+      title="人员添加"
+      :visible.sync="peopleOpen"
+      v-if="peopleOpen"
+      width="1000px"
+      append-to-body
+    >
+      <el-table
+        v-loading="loading"
+        :data="userList"
+        @selection-change="handleSelectionAddUser"
+        height="450"
+      >
+        <el-table-column type="selection" width="50" align="center" />
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column
+          label="人员账号"
+          align="center"
+          key="userName"
+          prop="userName"
+          width="120"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="人员名称"
+          align="center"
+          key="nickName"
+          prop="nickName"
+          width="120"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="所属机构"
+          align="center"
+          key="deptName"
+          prop="deptName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="角色"
+          align="center"
+          key="roleName"
+          prop="roleName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="联系电话"
+          align="center"
+          key="telphone"
+          prop="telphone"
+        />
+        <!-- <el-table-column
           label="操作"
           align="center"
           width="160"
@@ -515,27 +536,27 @@
 
           </template>
         </el-table-column>-->
-            </el-table>
+      </el-table>
 
-            <div slot="footer" class="dialog-footer" style="text-align: center">
-                <el-button type="primary" @click="addUser">添加</el-button>
-            </div>
-        </el-dialog>
-    </div>
+      <div slot="footer" class="dialog-footer" style="text-align: center">
+        <el-button type="primary" @click="addUser">添加</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import {
-    getListNewBuy,
-    getPurchaseCheckInfo,
-    getAcceptanceForm,
-    purchaseCheckInfoRemove,
-    getNoticePeople,
-    getListUnSelected,
-    addNoticeUser,
-    bmNoticeInfo,
-    delPeople
-} from '@/api/purchase/goodsArrived'
+  getListNewBuy,
+  getPurchaseCheckInfo,
+  getAcceptanceForm,
+  purchaseCheckInfoRemove,
+  getNoticePeople,
+  getListUnSelected,
+  addNoticeUser,
+  bmNoticeInfo,
+  delPeople,
+} from "@/api/purchase/goodsArrived";
 // import {
 //     getRepairedList,
 //     getRepairedDetailList,
@@ -546,344 +567,351 @@ import {
 // import { getLeaseAuditListAll } from '@/api/claimAndRefund/receive'
 
 export default {
-    name: 'Home',
-    dicts: ['purchase_task_status'],
-    // components: { vueEasyPrint },
-    data() {
-        return {
-            // 遮罩层
-            loading: true,
-            loadingTwo: true,
-            updateTime:"",
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            showPeople: false,
-            peopleOpen: false,
-            // 总条数
-            total: 0,
-            totalTwo: 0,
-            //搜索下拉数据
-            typesList: [],
-            modelList: [],
-            // 字典表格数据
-            typeList: [],
-            getListPeople:[],
-            configUserList: [],
-            phoneNumbers:[],
-            //选择人员
-            chosenUserList: [],
-            userList: [],
-            // 弹出层标题
-            title: '',
-            // 日期范围
-            dateRange: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                time: null, //申请时间
-                name: undefined,
-                typeId: '',
-                keyWord: '',
-            },
-            form: {
-                remark: '',
-            },
-            // 表单校验
-            rules: {
-                remark: [{required: true,message: '通知内容不能为空',trigger: 'blur'}],
-            },
-            openPrint: false,
-            printData: {},
-            printTableData: [],
-            // 供应商
-            supplierStr: '',
+  name: "Home",
+  dicts: ["purchase_task_status"],
+  // components: { vueEasyPrint },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      loadingTwo: true,
+      updateTime: "",
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      showPeople: false,
+      peopleOpen: false,
+      // 总条数
+      total: 0,
+      totalTwo: 0,
+      //搜索下拉数据
+      typesList: [],
+      modelList: [],
+      // 字典表格数据
+      typeList: [],
+      getListPeople: [],
+      configUserList: [],
+      phoneNumbers: [],
+      //选择人员
+      chosenUserList: [],
+      userList: [],
+      // 弹出层标题
+      title: "",
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        time: null, //申请时间
+        name: undefined,
+        typeId: "",
+        keyWord: "",
+      },
+      form: {
+        remark: "",
+      },
+      // 表单校验
+      rules: {
+        remark: [
+          { required: true, message: "通知内容不能为空", trigger: "blur" },
+        ],
+      },
+      openPrint: false,
+      printData: {},
+      printTableData: [],
+      // 供应商
+      supplierStr: "",
+    };
+  },
+  created() {
+    this.getList();
+    // this.getTypeList()
+  },
+  methods: {
+    // getTypeList() {
+    //     getTypeList({ level: '3' }).then((response) => {
+    //         this.typesList = response.data
+    //     })
+    //     getTypeList({ level: '4' }).then((response) => {
+    //         this.modelList = response.data
+    //     })
+    // },
+
+    getList() {
+      this.loading = true;
+      const params = {
+        keyWord: this.queryParams.keyWord,
+        startTime: this.queryParams.time && this.queryParams.time[0],
+        endTime: this.queryParams.time && this.queryParams.time[1],
+        typeId: this.queryParams.typeId,
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+      };
+      getListNewBuy(this.addDateRange(params)).then((response) => {
+        this.typeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.time = [];
+      this.resetForm("queryForm");
+      this.queryParams.keyWord = "";
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$emit("addTools");
+    },
+    /** 查看按钮操作 */
+    handleView(row) {
+      this.$emit("queryTools", row.taskId, row.id);
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$emit("editTools", row.taskId, row.id);
+    },
+
+    //----消息通知
+    getNowTime() {
+      var today = new Date();
+      var year = today.getFullYear(); //获取年份
+      var month = today.getMonth() + 1; //获取月份
+      var day = today.getDate(); //获取日期
+      return year + "-" + month + "-" + day;
+    },
+
+    handleNotice(row) {
+      this.reset();
+      this.form.taskId = row.taskId;
+      this.$set(
+        this.form,
+        "remark",
+        "各位同事您好，请于" +
+          this.getNowTime() +
+          "在宏源工业园，进行机具验收。"
+      );
+      this.getNoticeList();
+      this.showPeople = true;
+    },
+    getNoticeList() {
+      const taskId = this.form.taskId;
+      getNoticePeople({ taskId: taskId }).then((response) => {
+        this.getListPeople = response.rows;
+        this.showPeople = true;
+        this.loadingTwo = false;
+        this.title = "通知";
+      });
+    },
+    addUserOpen() {
+      this.getAllUserList();
+      this.peopleOpen = true;
+    },
+    /** 查询所有用户列表--可添加人员 */
+    getAllUserList() {
+      getListUnSelected().then((response) => {
+        this.userList = response.rows;
+      });
+    },
+
+    // 多选框选中-添加人员
+    handleSelectionAddUser(selection) {
+      // console.log(selection)
+      this.chosenUserList = selection;
+    },
+    //添加人员
+    addUser() {
+      if (this.chosenUserList.length < 1) {
+        this.$message.error("请选择人员！");
+        return;
+      }
+      // console.log(this.chosenUserList,"chosenUserList")
+      addNoticeUser(this.chosenUserList).then((response) => {
+        if (response.code == 200) {
+          this.getNoticeList();
+          this.peopleOpen = false;
         }
+      });
     },
-    created() {
-        this.getList()
-        // this.getTypeList()
+    handleDeletePeople(row) {
+      const ids = row.id;
+      this.$modal
+        .confirm("是否删除所选择的通知人员？")
+        .then(function () {
+          return delPeople(ids);
+        })
+        .then(() => {
+          this.getNoticeList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
-    methods: {
-
-        // getTypeList() {
-        //     getTypeList({ level: '3' }).then((response) => {
-        //         this.typesList = response.data
-        //     })
-        //     getTypeList({ level: '4' }).then((response) => {
-        //         this.modelList = response.data
-        //     })
-        // },
-
-        getList() {
-            this.loading = true
-            const params = {
-                keyWord: this.queryParams.keyWord,
-                startTime: this.queryParams.time && this.queryParams.time[0],
-                endTime: this.queryParams.time && this.queryParams.time[1],
-                typeId: this.queryParams.typeId,
-                pageSize: this.queryParams.pageSize,
-                pageNum: this.queryParams.pageNum,
-            }
-            getListNewBuy(this.addDateRange(params)).then(
-                (response) => {
-                    this.typeList = response.rows
-                    this.total = response.total
-                    this.loading = false
-                },
-            )
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1
-            this.getList()
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.queryParams.time = []
-            this.resetForm('queryForm')
-            this.queryParams.keyWord = ''
-            this.handleQuery()
-        },
-        /** 新增按钮操作 */
-        handleAdd() {
-            this.$emit('addTools')
-        },
-        /** 查看按钮操作 */
-        handleView(row) {
-            this.$emit('queryTools', row.taskId,row.id)
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.$emit('editTools', row.taskId, row.id)
-        },
-
-        //----消息通知
-        getNowTime() {
-            var today = new Date()
-            var year = today.getFullYear() //获取年份
-            var month = today.getMonth() + 1 //获取月份
-            var day = today.getDate() //获取日期
-            return year + '-' + month + '-' + day
-        },
-
-        handleNotice(row){
-          this.reset()
-          this.form.taskId = row.taskId;
-          this.$set(this.form,'remark','各位同事您好，请于' + this.getNowTime() + '在宏源工业园，进行机具验收。')
-          this.getNoticeList()
-          this.showPeople = true;
-        },
-        getNoticeList(){
-            const taskId = this.form.taskId;
-            getNoticePeople({taskId: taskId}).then((response) => {
-                this.getListPeople = response.rows;
-                this.showPeople = true
-                this.loadingTwo = false
-                this.title = '通知'
-            })
-        },
-        addUserOpen() {
-            this.getAllUserList()
-            this.peopleOpen = true
-        },
-         /** 查询所有用户列表--可添加人员 */
-         getAllUserList() {
-            getListUnSelected().then((response) => {
-                this.userList = response.rows
-            })
-        },
-      
-        // 多选框选中-添加人员
-        handleSelectionAddUser(selection) {
-            // console.log(selection)
-            this.chosenUserList = selection
-        },
-        //添加人员
-        addUser() {
-            if (this.chosenUserList.length < 1) {
-                this.$message.error('请选择人员！')
-                return
-            }
-            // console.log(this.chosenUserList,"chosenUserList")
-            addNoticeUser(this.chosenUserList).then((response) => {
-                if (response.code == 200) {
-                    this.getNoticeList()
-                    this.peopleOpen = false
-                }
-            })
-        },
-        handleDeletePeople(row){
-            const ids = row.id
-            this.$modal
-                .confirm('是否删除所选择的通知人员？')
-                .then(function () {
-                    return delPeople(ids)
-                })
-                .then(() => {
-                    this.getNoticeList()
-                    this.$modal.msgSuccess('删除成功')
-                })
-                .catch(() => {})
-        },
-        // 多选框选中-通知人员
-        handleSelectionUser(selection) {
-            // console.log(selection)
-            this.configUserList = selection
-        },
-        //确认消息通知
-        configNotice() {
-            this.$refs['form'].validate((valid) => {
-                if (valid) {
-                    this.configUserList.forEach((item, index) => {
-                        console.log(item)
-                        // item.telphone = item.telphone
-                        // item.remark = this.form.remark
-                        this.phoneNumbers.push(item.telphone)
-                    })
-                    let param = {
-                        taskId:this.form.taskId,
-                        phoneNumbers: this.phoneNumbers,
-                        content: this.form.remark
-                    }
-                    if (this.configUserList.length > 0) {
-                        bmNoticeInfo(param).then((response) => {
-                            console.log(response)
-                            if (response.code == 200) {
-                                this.$message({
-                                    message: '操作成功',
-                                    type: 'success',
-                                })
-                                this.noticeOpen = false
-                                this.getTaskInfo()
-                            }
-                        })
-                    } else {
-                        this.$message({
-                            message: '请选择通知人员！',
-                            type: 'error',
-                        })
-                    }
-                }
-            })
-        },
-        // 人员取消按钮
-        cancel() {
-            this.showPeople = false;
-            this.reset();
-        },
-        // 表单重置 
-        reset() {
-            this.form = {
-                taskId:"",
-                remark:"",
-            };
-            this.resetForm("form");
-        },
-        // // 多选框选中数据
-        // handleSelectionChange(selection) {
-        //     this.ids = selection.map((item) => item.taskId)
-        //     this.single = selection.length != 1
-        //     this.multiple = !selection.length
-        // },
-
-        /** 验收按钮 */
-        handleAccept(row) {
-            // let query = { taskId: row.taskId }
-            // this.$tab.closeOpenPage({
-            //     path: '/store/newBuy/newDevicesAccept',
-            //     query,
-            // })
-            this.$emit('acceptTools', row.taskId)
-        },
-        //编码管理
-        handleCode(row) {
-            // let query = { taskId: row.taskId }
-            // this.$tab
-            //     .closeOpenPage({
-            //         path: '/store/newBuy/newDevicesCode',
-            //         query,
-            //     })
-            //     .then(() => {
-            //         this.$tab.refreshPage()
-            //     })
-            this.$emit('codingTools', row.taskId)
-        },
-
-        //获取验收单数据
-        getPrintTable(taskId) {
-            getAcceptanceForm({ taskId: taskId }).then((response) => {
-                this.printData = response.data
-                this.printTableData = response.data.checkDetailsList
-
-                let supplierList = []
-                this.printTableData.forEach((e) => {
-                    if (e.supplier) {
-                        supplierList.push(e.supplier)
-                    }
-                })
-                supplierList = [...new Set(supplierList)]
-
-                this.supplierStr = supplierList.join(',')
-            })
-        },
-        //查看验收单
-        handlePrint(row) {
-            // this.query.taskId = row.taskId
-            // this.getPrintTable(row.taskId)
-            this.openPrint = true
-            this.title = '机具设备到货验收单'
-        },
-        //打印
-        print() {
-            this.$refs.remarksPrintRef.print()
-        },
-
-        /** 删除按钮操作 */
-        handleDeletePurchase(row) {
-            // console.log(row) 
-            this.$modal
-                .confirm('是否确认删除所选择的数据项？')
-                .then(function () {
-                    return purchaseCheckInfoRemove(row.id)
-                })
-                .then(() => {
-                    this.getList()
-                    this.$modal.msgSuccess('删除成功')
-                })
-                .catch(() => {})
-        },
-
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('/material/purchase_check_info/export',{...this.queryParams},`新购到货_${new Date().getTime()}.xlsx`)
-        },
-
+    // 多选框选中-通知人员
+    handleSelectionUser(selection) {
+      // console.log(selection)
+      this.configUserList = selection;
+    },
+    //确认消息通知
+    configNotice() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          this.configUserList.forEach((item, index) => {
+            console.log(item);
+            // item.telphone = item.telphone
+            // item.remark = this.form.remark
+            this.phoneNumbers.push(item.telphone);
+          });
+          let param = {
+            taskId: this.form.taskId,
+            phoneNumbers: this.phoneNumbers,
+            content: this.form.remark,
+          };
+          if (this.configUserList.length > 0) {
+            bmNoticeInfo(param).then((response) => {
+              console.log(response);
+              if (response.code == 200) {
+                this.$message({
+                  message: "操作成功",
+                  type: "success",
+                });
+                this.noticeOpen = false;
+                this.getTaskInfo();
+              }
+            });
+          } else {
+            this.$message({
+              message: "请选择通知人员！",
+              type: "error",
+            });
+          }
+        }
+      });
+    },
+    // 人员取消按钮
+    cancel() {
+      this.showPeople = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        taskId: "",
+        remark: "",
+      };
+      this.resetForm("form");
+    },
+    // // 多选框选中数据
+    // handleSelectionChange(selection) {
+    //     this.ids = selection.map((item) => item.taskId)
+    //     this.single = selection.length != 1
+    //     this.multiple = !selection.length
+    // },
 
+    /** 验收按钮 */
+    handleAccept(row) {
+      // let query = { taskId: row.taskId }
+      // this.$tab.closeOpenPage({
+      //     path: '/store/newBuy/newDevicesAccept',
+      //     query,
+      // })
+      this.$emit("acceptTools", row.taskId);
+    },
+    //编码管理
+    handleCode(row) {
+      // let query = { taskId: row.taskId }
+      // this.$tab
+      //     .closeOpenPage({
+      //         path: '/store/newBuy/newDevicesCode',
+      //         query,
+      //     })
+      //     .then(() => {
+      //         this.$tab.refreshPage()
+      //     })
+      this.$emit("codingTools", row.taskId);
     },
 
-    watch: {
-        $route: {
-            handler(to) {
-                if (to.query.keyWord) {
-                    this.queryParams.keyWord = to.query.keyWord
-                }
-            },
-            deep: true,
-            immediate: true,
-        },
+    //获取验收单数据
+    getPrintTable(taskId) {
+      getAcceptanceForm({ taskId: taskId }).then((response) => {
+        this.printData = response.data;
+        this.printTableData = response.data.checkDetailsList;
+
+        let supplierList = [];
+        this.printTableData.forEach((e) => {
+          if (e.supplier) {
+            supplierList.push(e.supplier);
+          }
+        });
+        supplierList = [...new Set(supplierList)];
+
+        this.supplierStr = supplierList.join(",");
+      });
     },
-}
+    //查看验收单
+    handlePrint(row) {
+      // this.query.taskId = row.taskId
+      // this.getPrintTable(row.taskId)
+      this.openPrint = true;
+      this.title = "机具设备到货验收单";
+    },
+    //打印
+    print() {
+      this.$refs.remarksPrintRef.print();
+    },
+
+    /** 删除按钮操作 */
+    handleDeletePurchase(row) {
+      // console.log(row)
+      this.$modal
+        .confirm("是否确认删除所选择的数据项？")
+        .then(function () {
+          return purchaseCheckInfoRemove(row.id);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "/material/purchase_check_info/export",
+        { ...this.queryParams },
+        `新购到货_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+
+  watch: {
+    $route: {
+      handler(to) {
+        if (to.query.keyWord) {
+          this.queryParams.keyWord = to.query.keyWord;
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 ::v-deep.el-table .fixed-width .el-button--mini {
-    width: 70px !important;
-    margin-bottom: 10px;
+  width: 70px !important;
+  margin-bottom: 10px;
 }
 </style>

From 56dc6791fce896448592cb343ef9d5aa88356b6e Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 11 Nov 2024 16:16:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=86=E6=96=99=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lease/apply.js                        |  66 +++
 .../lease/apply/component/addToolsApply.vue   | 249 ++---------
 .../lease/apply/component/homeApply.vue       | 390 +++---------------
 src/views/material/lease/apply/index.vue      |   6 +-
 4 files changed, 166 insertions(+), 545 deletions(-)
 create mode 100644 src/api/lease/apply.js

diff --git a/src/api/lease/apply.js b/src/api/lease/apply.js
new file mode 100644
index 00000000..695cb6b3
--- /dev/null
+++ b/src/api/lease/apply.js
@@ -0,0 +1,66 @@
+import request from '@/utils/request'
+
+//领料申请-列表
+export function getListLeaseApply(query) {
+  return request({
+    url: '/material/lease_apply_info/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+//新购到货-二级列表详情
+export function getPurchaseCheckInfo(query) {
+  return request({
+    url: '/material/purchase_check_info/getInfo',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 新购到货-新增
+export function addPurchaseCheckInfo(data) {
+  return request({
+    url: '/material/purchase_check_info',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 新购到货-编辑
+export function updatePurchaseCheckInfo(data) {
+  return request({
+    url: '/material/purchase_check_info',
+    method: 'put',
+    data: data,
+  })
+}
+
+// 新购到货--删除
+export function purchaseCheckInfoRemove(ids) {
+  return request({
+    url: '/material/purchase_check_info/' + ids,
+    method: 'delete',
+  })
+}
+
+
+
+// 上传报告附件
+export function uploadPurchaseFile(data) {
+  return request({
+    url: '/material/bm_file_info',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// // 状态信息下拉框-
+// export function queryStatusDataApi(query) {
+//   return request({
+//     url: '/system/lease_apply_status/listNoPage',
+//     method: 'get',
+//     params: query
+//   })
+// }
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index abf7165b..7e225afe 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -9,20 +9,10 @@
       :inline="true"
       label-width="120px"
     >
-      <el-form-item label="到货日期" prop="arrivalTime">
-        <el-date-picker
-          v-model="maForm.arrivalTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd hh:mm:ss"
-          :picker-options="pickerOptions"
-          type="date"
-          placeholder="请选择到货日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="物资厂家" prop="supplierId">
+      <el-form-item label="租赁单位" prop="arrivalTime">
         <el-select
           v-model="maForm.supplierId"
-          placeholder="物资厂家"
+          placeholder="租赁单位"
           clearable
           filterable
           style="width: 240px"
@@ -35,28 +25,44 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="出厂日期" prop="productionTime">
-        <el-date-picker
-          v-model="maForm.productionTime"
+      <el-form-item label="租赁工程" prop="supplierId">
+        <el-select
+          v-model="maForm.supplierId"
+          placeholder="租赁工程"
+          clearable
+          filterable
           style="width: 240px"
-          value-format="yyyy-MM-dd"
-          :picker-options="pickerOptions"
-          type="date"
-          placeholder="请选择出厂日期"
-          @change="productionTimeChange"
-        ></el-date-picker>
+        >
+          <el-option
+            v-for="item in supplierList"
+            :key="item.supplierId"
+            :label="item.supplier"
+            :value="item.supplierId"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="税率" prop="taxRate">
+      <el-form-item label="领料人" prop="taxRate">
         <el-input
           v-model="maForm.taxRate"
-          placeholder="请输入税率"
+          placeholder="请输入领料人"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+          @input="taxRateChange"
+        />
+      </el-form-item>
+
+      <el-form-item label="联系电话" prop="taxRate">
+        <el-input
+          v-model="maForm.taxRate"
+          placeholder="请输入联系电话"
           clearable
           maxlength="50"
           style="width: 240px"
           @keyup.enter.native="handleQuery"
           @input="taxRateChange"
         />
-        <span>%</span>
       </el-form-item>
 
       <el-form-item label="类型规格" prop="deviceType">
@@ -75,18 +81,6 @@
           @change="deviceTypeChange"
         ></el-cascader>
       </el-form-item>
-
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="maForm.remark"
-          placeholder="请输入备注"
-          clearable
-          maxlength="150"
-          type="textarea"
-          style="width: 240px"
-          rows="1"
-        />
-      </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
@@ -113,7 +107,7 @@
       <el-table-column align="center" label="序号" type="index" width="55" />
       <el-table-column
         align="center"
-        label="物资名称"
+        label="类型名称"
         prop="maTypeName"
         show-overflow-tooltip
       ></el-table-column>
@@ -123,8 +117,9 @@
         prop="typeName"
         show-overflow-tooltip
       />
-      <el-table-column align="center" label="单位" prop="unitName" />
-      <el-table-column label="采购数量" prop="purchaseNum" align="center">
+      <el-table-column align="center" label="计量单位" prop="unitName" />
+      <el-table-column align="center" label="当前库存" prop="unitName" />
+      <el-table-column label="预领数量" prop="purchaseNum" align="center">
         <template v-slot="scope">
           <el-input-number
             v-model="scope.row.purchaseNum"
@@ -134,11 +129,9 @@
           ></el-input-number>
         </template>
       </el-table-column>
-      <el-table-column
-        label="购置单价(元含税)"
-        prop="purchaseTaxPrice"
-        align="center"
-      >
+
+      <el-table-column align="center" label="出货数量" prop="unitName" />
+      <el-table-column label="备注" prop="purchaseTaxPrice" align="center">
         <template v-slot="scope">
           <el-input-number
             v-model="scope.row.purchaseTaxPrice"
@@ -149,88 +142,7 @@
           ></el-input-number>
         </template>
       </el-table-column>
-      <el-table-column
-        label="购置单价(元不含税)"
-        prop="purchasePrice"
-        align="center"
-      >
-        <template slot-scope="scope">
-          <el-input-number
-            v-model="scope.row.purchasePrice"
-            controls-position="right"
-            style="width: 100%"
-            :min="0"
-            @input="purchasePriceChange(scope.row, scope.$index)"
-          ></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="是否为固定资产"
-        prop="fixCode"
-        align="center"
-        width="200"
-      >
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.fixCode"
-            placeholder="固定资产"
-            filterable
-            clearable
-          >
-            <el-option label="是" value="1"></el-option>
-            <el-option label="否" value="0"></el-option>
-          </el-select>
-        </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: 100%"
-            value-format="yyyy-MM-dd"
-            type="date"
-            placeholder="出厂日期"
-            clearable
-          ></el-date-picker>
-        </template>
-      </el-table-column>
-
-      <el-table-column label="相关配套资料" align="center" prop="bmFileInfos">
-        <template slot-scope="scope">
-          <div
-            style="color: rgb(2, 167, 240); cursor: pointer"
-            @click="openFileDialog(scope.row)"
-          >
-            报告管理
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="status"
-        :show-overflow-tooltip="true"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.purchase_task_status"
-            :value="scope.row.status"
-          />
-        </template>
-      </el-table-column>
-
-      <!-- <el-table-column
-                align="center"
-                label="验收结论"
-                prop="checkResult"
-                show-overflow-tooltip
-            ></el-table-column> -->
       <el-table-column label="操作" align="center">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <el-button
@@ -244,93 +156,6 @@
         </template>
       </el-table-column>
     </el-table>
-
-    <el-dialog
-      title="报告管理"
-      :visible.sync="open"
-      width="900px"
-      append-to-body
-    >
-      <el-table :data="fileDataList" width="100%" height="350px">
-        <el-table-column label="序号" type="index" width="55" align="center" />
-        <el-table-column
-          label="报告类型"
-          align="center"
-          prop="dictLabel"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="文件名称"
-          align="center"
-          prop="name"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="类型名称"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template>
-            <div>{{ this.rowData.maTypeName }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          label="规格型号"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
-          <template>
-            <div>{{ this.rowData.typeName }}</div>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="报告日期" align="center" prop="orgName" :show-overflow-tooltip="true"/>
-                <el-table-column label="截止有效期" align="center" prop="orgName" :show-overflow-tooltip="true"/> -->
-        <el-table-column label="操作" align="center" width="100">
-          <template slot-scope="scope">
-            <div
-              style="
-                display: flex;
-                align-items: center;
-                justify-content: space-between;
-              "
-            >
-              <el-upload
-                ref="upload"
-                :limit="1"
-                :headers="upload.headers"
-                :action="upload.url"
-                :show-file-list="false"
-                accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
-                :on-success="handleFileSuccess"
-                :auto-upload="true"
-              >
-                <el-button
-                  size="mini"
-                  type="text"
-                  @click="beforeFileUpload(scope.row)"
-                >
-                  上传
-                </el-button>
-              </el-upload>
-
-              <el-button
-                size="mini"
-                type="text"
-                @click="picturePreview(scope.row)"
-                v-if="scope.row.url"
-              >
-                查看
-              </el-button>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-    <!-- 图片查看弹窗 -->
-    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px">
-      <img width="100%" height="500px" :src="dialogImageUrl" />
-    </el-dialog>
   </div>
 </template>
 
diff --git a/src/views/material/lease/apply/component/homeApply.vue b/src/views/material/lease/apply/component/homeApply.vue
index 071bac27..0dc52ab6 100644
--- a/src/views/material/lease/apply/component/homeApply.vue
+++ b/src/views/material/lease/apply/component/homeApply.vue
@@ -21,23 +21,6 @@
         </el-date-picker>
       </el-form-item>
 
-      <el-form-item label="设备状态" prop="typeId">
-        <el-select
-          v-model="queryParams.typeId"
-          placeholder="请选择设备状态"
-          clearable
-          filterable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="typeItem in typesList"
-            :key="typeItem.typeId"
-            :label="typeItem.typeName"
-            :value="typeItem.typeId"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item label="关键字" prop="keyWord">
         <el-input
           v-model="queryParams.keyWord"
@@ -49,6 +32,23 @@
         />
       </el-form-item>
 
+      <el-form-item label="状态" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择状态"
+          clearable
+          filterable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.lease_apply_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item>
         <el-button
           type="primary"
@@ -134,7 +134,7 @@
         label="领料物资类型"
         align="center"
         prop="purchaseTaxPrice"
-        width="120px"
+        width="110px"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -147,7 +147,7 @@
         label="租赁申请单号"
         align="center"
         prop="taxRate"
-        width="120px"
+        width="110px"
         :show-overflow-tooltip="true"
       >
       </el-table-column>
@@ -177,28 +177,15 @@
       <el-table-column
         label="状态"
         align="center"
-        prop="taskStatus"
+        prop="status"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.purchase_task_status"
-            :value="scope.row.taskStatus"
+            :value="scope.row.status"
           />
         </template>
-        <!-- <template slot-scope="scope">
-                    <span v-if="scope.row.taskStatus==0">待提交</span>
-                    <span v-if="scope.row.taskStatus==1">待通知</span>
-                    <span v-if="scope.row.taskStatus==2">待验收</span>
-                    <span v-if="scope.row.taskStatus==3">待绑定</span>
-                    <span v-if="scope.row.taskStatus==4">待入库</span>
-                    <span v-if="scope.row.taskStatus==5">已完成</span>
-                    <span v-if="scope.row.taskStatus==6">驳回待验收</span>
-                    <span v-if="scope.row.taskStatus==7">驳回待绑定</span>
-                    <span v-if="scope.row.taskStatus==8">驳回待入库</span>
-                    <span v-if="scope.row.taskStatus==9">入库进行中</span>
-                    <span v-if="scope.row.taskStatus==10">未完成</span>
-                </template> -->
       </el-table-column>
       <el-table-column
         label="备注"
@@ -208,14 +195,13 @@
         :show-overflow-tooltip="true"
       />
 
-      <el-table-column label="操作" align="center" width="250">
+      <el-table-column label="操作" align="center" width="300">
         <template slot-scope="scope">
           <el-button
             size="mini"
             style="margin-bottom: 10px"
             type="normal"
             @click="handleView(scope.row)"
-            v-if="scope.row.taskStatus != 24"
             >查看</el-button
           >
           <el-button
@@ -223,6 +209,7 @@
             style="margin-bottom: 10px"
             type="primary"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.status != '2'"
             v-hasPermi="['purchase:info:edit']"
             >编辑</el-button
           >
@@ -232,17 +219,30 @@
             style="margin-bottom: 10px"
             type="success"
             @click="handleNotice(scope.row)"
+            v-if="scope.row.status == '0'"
             v-hasPermi="['purchase:person:notice']"
-            >通知</el-button
+            >发布</el-button
           >
-          <el-button size="mini" type="warning" @click="handlePrint(scope.row)"
-            >验收单</el-button
+          <el-button
+            size="mini"
+            type="warning"
+            @click="handlePrint(scope.row)"
+            v-if="scope.row.status == '2'"
+            >领料单</el-button
+          >
+          <el-button
+            size="mini"
+            type="warning"
+            @click="handlePrint(scope.row)"
+            v-if="scope.row.status == '2'"
+            >出库检验单</el-button
           >
 
           <el-button
             size="mini"
             type="danger"
             @click="handleDeletePurchase(scope.row)"
+            v-if="scope.row.status == '0'"
             v-hasPermi="['purchase:info:remove']"
             >删除</el-button
           >
@@ -399,196 +399,21 @@
         <el-button @click="openPrint = false">关 闭</el-button>
       </div>
     </el-dialog>
-
-    <!-- 通知弹窗 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="showPeople"
-      width="800px"
-      append-to-body
-      @close="cancel"
-    >
-      <el-row :gutter="24">
-        <el-col :span="20">
-          <el-form
-            :model="form"
-            ref="form"
-            size="small"
-            :inline="true"
-            :rules="rules"
-          >
-            <el-form-item label="通知内容:" prop="remark" label-width="100px">
-              <el-input
-                v-model="form.remark"
-                type="textarea"
-                maxlength="100"
-                :autosize="{ minRows: 3, maxRows: 6 }"
-                placeholder="请输入通知内容"
-                style="width: 450px"
-              />
-            </el-form-item>
-          </el-form>
-        </el-col>
-      </el-row>
-
-      <el-table
-        :data="getListPeople"
-        width="600px"
-        height="450"
-        @selection-change="handleSelectionUser"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-          :reserve-selection="true"
-        />
-        <el-table-column
-          label="人员名称"
-          align="center"
-          prop="userName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="所属机构"
-          align="center"
-          prop="deptName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="角色"
-          align="center"
-          prop="roleName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="联系电话"
-          align="center"
-          prop="telphone"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="操作"
-          align="center"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="danger"
-              @click="handleDeletePeople(scope.row)"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="addUserOpen">人员添加</el-button>
-        <el-button type="primary" @click="configNotice">发起验收</el-button>
-      </div>
-    </el-dialog>
-
-    <!--    人员添加  -->
-    <el-dialog
-      title="人员添加"
-      :visible.sync="peopleOpen"
-      v-if="peopleOpen"
-      width="1000px"
-      append-to-body
-    >
-      <el-table
-        v-loading="loading"
-        :data="userList"
-        @selection-change="handleSelectionAddUser"
-        height="450"
-      >
-        <el-table-column type="selection" width="50" align="center" />
-        <el-table-column label="序号" align="center" type="index" />
-        <el-table-column
-          label="人员账号"
-          align="center"
-          key="userName"
-          prop="userName"
-          width="120"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="人员名称"
-          align="center"
-          key="nickName"
-          prop="nickName"
-          width="120"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="所属机构"
-          align="center"
-          key="deptName"
-          prop="deptName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="角色"
-          align="center"
-          key="roleName"
-          prop="roleName"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          label="联系电话"
-          align="center"
-          key="telphone"
-          prop="telphone"
-        />
-        <!-- <el-table-column
-          label="操作"
-          align="center"
-          width="160"
-          class-name="small-padding fixed-width"
-        >
-          <template slot-scope="scope" v-if="scope.row.userId !== 1">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-plus"
-              @click="addUser(scope.row)"
-            >添加</el-button>
-
-          </template>
-        </el-table-column>-->
-      </el-table>
-
-      <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="addUser">添加</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  getListNewBuy,
+  getListLeaseApply,
   getPurchaseCheckInfo,
   getAcceptanceForm,
   purchaseCheckInfoRemove,
-  getNoticePeople,
-  getListUnSelected,
-  addNoticeUser,
-  bmNoticeInfo,
-  delPeople,
-} from "@/api/purchase/goodsArrived";
-// import {
-//     getRepairedList,
-//     getRepairedDetailList,
-//     inputByType,
-//     getTypeList,
-// } from '@/api/store/warehousing'
-// import vueEasyPrint from 'vue-easy-print'
-// import { getLeaseAuditListAll } from '@/api/claimAndRefund/receive'
+  queryStatusDataApi,
+} from "@/api/lease/apply";
 
 export default {
   name: "Home",
-  dicts: ["purchase_task_status"],
+  dicts: ["lease_apply_status"],
   // components: { vueEasyPrint },
   data() {
     return {
@@ -624,6 +449,7 @@ export default {
       title: "",
       // 日期范围
       dateRange: [],
+      statusDataRange: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -650,6 +476,7 @@ export default {
     };
   },
   created() {
+    // this.getStatusList();
     this.getList();
     // this.getTypeList()
   },
@@ -663,6 +490,20 @@ export default {
     //     })
     // },
 
+    // /** 查询状态类型 */
+    // getStatusList(data) {
+    //   let statusdataRes = queryStatusDataApi({
+    //     // typeId:data.keeperData
+    //   });
+    //   this.statusDataRange = statusdataRes.data.map((item) => {
+    //     return {
+    //       label: item.dictLabel,
+    //       value: item.dictValue,
+    //     };
+    //   });
+    //   this.queryForm.statusDataRange = this.statusDataRange.value;
+    // },
+
     getList() {
       this.loading = true;
       const params = {
@@ -673,7 +514,7 @@ export default {
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
       };
-      getListNewBuy(this.addDateRange(params)).then((response) => {
+      getListLeaseApply(this.addDateRange(params)).then((response) => {
         this.typeList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -713,117 +554,6 @@ export default {
       return year + "-" + month + "-" + day;
     },
 
-    handleNotice(row) {
-      this.reset();
-      this.form.taskId = row.taskId;
-      this.$set(
-        this.form,
-        "remark",
-        "各位同事您好，请于" +
-          this.getNowTime() +
-          "在宏源工业园，进行机具验收。"
-      );
-      this.getNoticeList();
-      this.showPeople = true;
-    },
-    getNoticeList() {
-      const taskId = this.form.taskId;
-      getNoticePeople({ taskId: taskId }).then((response) => {
-        this.getListPeople = response.rows;
-        this.showPeople = true;
-        this.loadingTwo = false;
-        this.title = "通知";
-      });
-    },
-    addUserOpen() {
-      this.getAllUserList();
-      this.peopleOpen = true;
-    },
-    /** 查询所有用户列表--可添加人员 */
-    getAllUserList() {
-      getListUnSelected().then((response) => {
-        this.userList = response.rows;
-      });
-    },
-
-    // 多选框选中-添加人员
-    handleSelectionAddUser(selection) {
-      // console.log(selection)
-      this.chosenUserList = selection;
-    },
-    //添加人员
-    addUser() {
-      if (this.chosenUserList.length < 1) {
-        this.$message.error("请选择人员！");
-        return;
-      }
-      // console.log(this.chosenUserList,"chosenUserList")
-      addNoticeUser(this.chosenUserList).then((response) => {
-        if (response.code == 200) {
-          this.getNoticeList();
-          this.peopleOpen = false;
-        }
-      });
-    },
-    handleDeletePeople(row) {
-      const ids = row.id;
-      this.$modal
-        .confirm("是否删除所选择的通知人员？")
-        .then(function () {
-          return delPeople(ids);
-        })
-        .then(() => {
-          this.getNoticeList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
-    },
-    // 多选框选中-通知人员
-    handleSelectionUser(selection) {
-      // console.log(selection)
-      this.configUserList = selection;
-    },
-    //确认消息通知
-    configNotice() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          this.configUserList.forEach((item, index) => {
-            console.log(item);
-            // item.telphone = item.telphone
-            // item.remark = this.form.remark
-            this.phoneNumbers.push(item.telphone);
-          });
-          let param = {
-            taskId: this.form.taskId,
-            phoneNumbers: this.phoneNumbers,
-            content: this.form.remark,
-          };
-          if (this.configUserList.length > 0) {
-            bmNoticeInfo(param).then((response) => {
-              console.log(response);
-              if (response.code == 200) {
-                this.$message({
-                  message: "操作成功",
-                  type: "success",
-                });
-                this.noticeOpen = false;
-                this.getTaskInfo();
-              }
-            });
-          } else {
-            this.$message({
-              message: "请选择通知人员！",
-              type: "error",
-            });
-          }
-        }
-      });
-    },
-    // 人员取消按钮
-    cancel() {
-      this.showPeople = false;
-      this.reset();
-    },
     // 表单重置
     reset() {
       this.form = {
diff --git a/src/views/material/lease/apply/index.vue b/src/views/material/lease/apply/index.vue
index 8e68514d..f75fada8 100644
--- a/src/views/material/lease/apply/index.vue
+++ b/src/views/material/lease/apply/index.vue
@@ -38,7 +38,7 @@ export default {
   data() {
     return {
       isShowComponent: "Home",
-      pageContent: "新增机具",
+      pageContent: "领料申请",
       isEdit: false,
       editTaskId: "",
       editId: "",
@@ -55,7 +55,7 @@ export default {
       this.isEdit = false;
       this.editTaskId = "";
       this.queryTaskId = "";
-      this.pageContent = "新增机具";
+      this.pageContent = "领料申请";
       this.isShowComponent = "AddTools";
     },
     /* 新增成功 */
@@ -65,7 +65,7 @@ export default {
     /* 编辑工机具 */
     editTools(taskId, id) {
       this.isEdit = true;
-      this.pageContent = "编辑机具";
+      this.pageContent = "领料编辑";
       this.editTaskId = taskId;
       this.editId = id;
       this.isShowComponent = "AddTools";