diff --git a/src/views/material/basic/bmUnit/index.vue b/src/views/material/basic/bmUnit/index.vue
index e7c281e7..4a931a82 100644
--- a/src/views/material/basic/bmUnit/index.vue
+++ b/src/views/material/basic/bmUnit/index.vue
@@ -338,7 +338,7 @@ export default {
                 this.typeList = unitList.map((item) => {
                 return {
                 label: item.dictLabel,
-                value: item.dictValue,
+                value: item.dictCode,
                 };
             });
             })
diff --git a/src/views/material/part/partArrived/component/addTools.vue b/src/views/material/part/partArrived/component/addTools.vue
new file mode 100644
index 00000000..100b83c4
--- /dev/null
+++ b/src/views/material/part/partArrived/component/addTools.vue
@@ -0,0 +1,817 @@
+<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"
+                    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"
+                    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="10"
+                    style="width: 240px"
+                    @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="2"
+                />
+            </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
+                        v-model.number="scope.row.purchaseNum"
+                        controls-position="right" type="number"
+                        style="width: 100%" :disabled="scope.row.status!=1&&scope.row.status!=12"
+                        :min="0" @input="(v)=>(scope.row.unitValue==1?scope.row.purchaseNum=Number(v.replace(/[^\d.]/g,'')) : scope.row.purchaseNum=Number(v.replace(/[^\d]/g,'')))"
+                    ></el-input>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="购置单价(元含税)"
+                prop="purchaseTaxPrice"
+                align="center" width="200"
+            >
+                <template v-slot="scope">
+                    <el-input-number
+                        v-model="scope.row.purchaseTaxPrice"
+                        controls-position="right"
+                        style="width: 100%" @blur="scope.row.purchaseTaxPrice = scope.row.purchaseTaxPrice>0? scope.row.purchaseTaxPrice:0"
+                        :min="0" :step="1" :disabled="scope.row.status!=1&&scope.row.status!=12"
+                        @change="purchaseTaxPriceChange(scope.row,scope.$index)"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="购置单价(元不含税)"
+                prop="purchasePrice"
+                align="center"  width="200"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.purchasePrice"
+                        controls-position="right"
+                        style="width: 100%"
+                        :min="0" :step="1" disabled
+                        @input="purchasePriceChange(scope.row,scope.$index)"
+                    ></el-input-number>
+                </template>
+            </el-table-column>
+            <el-table-column label="租赁价(元/天)" prop="rentPrice"
+                align="center"  width="200"
+            >
+                <template slot-scope="scope">
+                    <el-input-number
+                        v-model="scope.row.rentPrice"
+                        controls-position="right"
+                        style="width: 100%" @blur="scope.row.rentPrice = scope.row.rentPrice>0? Number(scope.row.rentPrice.toFixed(2)) :0"
+                        :min="0" :step="1" :disabled="(scope.row.status!=1&&scope.row.status!=12)||scope.row.rentPriceDisabled"
+                    ></el-input-number>
+                </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"  :disabled="scope.row.status!=1&&scope.row.status!=12"
+                        placeholder="出厂日期"
+                        clearable
+                    ></el-date-picker>
+                </template>
+            </el-table-column>
+
+            <el-table-column
+                label="相关配套资料"
+                align="center" width="120"
+                prop="bmFileInfos"
+            >
+            <template slot-scope="scope">
+                <div style="color: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</div>
+                <div style="color: red;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</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" v-if="scope.row.status==1||scope.row.status==12"
+                        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="3" :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" style="margin-left: 20px;">
+                        查看
+                    </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: {
+                taxRate: [
+                    {
+                        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=>{
+                if(item.status==1||item.status==12){ 
+                    item.purchasePrice = ((item.purchaseTaxPrice/(100 + Number(this.maForm.taxRate)))*100).toFixed(10)
+                }
+            })
+        },
+        // 含税单价
+        purchaseTaxPriceChange(row,val){ 
+            row.purchaseTaxPrice = row.purchaseTaxPrice.toFixed(2) 
+            row.purchasePrice = ((row.purchaseTaxPrice/(100 + Number(this.maForm.taxRate)))*100).toFixed(10) 
+        },
+        // 不含税单价
+        purchasePriceChange(row,val){ 
+            // row.purchaseTaxPrice = ((row.purchasePrice*(100 + this.maForm.taxRate))/100).toFixed(2)
+        },
+        /** 物资厂家-下拉选 */
+        supplierInfoList() {
+            let param = {
+                pageNum: 1,
+                pageSize: 1000,
+                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 = []
+                console.log(this.equipmentList)
+                this.equipmentList.forEach((e) => { 
+                    console.log(this.equipmentList)
+                    selectList.push(this.getParentsById(this.equipmentTypeList, e.typeId, e.status)) 
+                })
+                this.deviceType = selectList
+            })
+        },
+        //树结构数据获取父
+        getParentsById(list, id, status) {
+            for (let i in list) {
+                if (list[i].typeId == id) {
+                    console.log(id)
+                    console.log(status)
+                    if(status!=1&&status!=12){
+                        list[i].disabled=true
+                    }
+                    //查询到就返回该数组对象的value
+                    return [list[i].typeId]
+                }
+                if (list[i].children) {
+                    let node = this.getParentsById(list[i].children, id, status)
+                    if (node !== undefined) {
+                        //查询到把父节把父节点加到数组前面
+                        node.unshift(list[i].typeId)
+                        return node
+                    }
+                }
+            }
+        },
+        //添加机具类型
+        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))
+                            console.log(z.data)
+                            // obj.supplierId = ''
+                            obj.createTime = null
+                            obj.productionTime = this.maForm.productionTime;
+                            obj.purchaseTaxPrice = 0
+                            obj.purchaseTaxPrice = 0
+                            obj.purchaseNum = 1
+                            obj.fixCode = "0"
+                            obj.status=1
+                            obj.bmFileInfos=[]
+                            if(obj.rentPrice>0){//判断是否有租赁价格：有禁用;无修改;
+                                obj.rentPriceDisabled=true
+                            }else{
+                                obj.rentPriceDisabled=false
+                            }
+                            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
+                console.log(this.equipmentList)
+            } else {
+                this.equipmentList = []
+            }
+        },
+        //选择出厂日期
+        productionTimeChange(val){
+            this.equipmentList.forEach(item=>{
+                if(item.status==1||item.status==12){
+                    item.productionTime=val
+                }
+            })
+        },
+        //获取任务详情--- 编辑回显数据
+        async getTaskInfo() {
+            // this.loading = true;
+            await getPurchaseCheckInfo({taskId:this.taskId,id:this.id,statusList:[1],taskStage: 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;
+                this.equipmentList.forEach(item=>{ 
+                    item.rentPriceDisabled=true 
+                })
+                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() { 
+            if (this.equipmentList.length > 0) {
+                this.$refs['maForm'].validate((valid) => {
+                    if (valid) {
+                        this.maForm.taskId = this.taskId;
+                        let index =this.equipmentList.findIndex(item=>item.purchaseNum==0)
+                        let index1 =this.equipmentList.findIndex(item=>item.rentPrice==0)
+                        let index2 =this.equipmentList.findIndex(item=>item.purchaseTaxPrice==0)
+                        if(index>-1){
+                            this.$modal.msgError('采购数量不能为0！')
+                        }else if(index1>-1){
+                            this.$modal.msgError('租赁价格不能为0！')
+                        }else{
+                            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.$emit(
+                                                'addToolsSuccess',
+                                            )
+                                        }
+                                        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.$emit(
+                                                'addToolsSuccess',
+                                            )
+                                        }
+                                        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
+          }
+        },
+        
+        /** 删除按钮操作 */
+        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.typeId == row.typeId) {
+                            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/part/partArrived/component/home.vue b/src/views/material/part/partArrived/component/home.vue
new file mode 100644
index 00000000..c7dc67ac
--- /dev/null
+++ b/src/views/material/part/partArrived/component/home.vue
@@ -0,0 +1,630 @@
+<template>
+  <div>
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-form-item>
+        <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 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  prop="isFinish">
+        <el-select
+            clearable
+            filterable
+            style="width: 240px"
+            placeholder="状态筛选"
+            v-model="queryParams.isFinish"
+        >
+
+          <el-option
+              v-for="dict in dict.type.part_task_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >配件到货新增</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="taskStatusName"
+        :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"
+                prop="remark"
+                show-overflow-tooltip
+            />
+      <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)"
+            
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            style="margin-bottom: 10px"
+            type="primary"
+            v-if="scope.row.taskStatusName == '未完成'"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['purchase:info:edit']"
+            >编辑</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>
+
+  </div>
+</template>
+
+<script>
+import {
+  getListNewBuy,
+  getPurchaseCheckInfo,
+  getAcceptanceForm,
+  purchaseCheckInfoRemove,
+  getNoticePeople,
+  getListUnSelected,
+  addNoticeUser,
+  bmNoticeInfo,
+  delPeople,
+} from "@/api/purchase/goodsArrived";
+
+export default {
+  name: "Home",
+  dicts: ["part_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: [],
+      taskStatusList:[{id:'0',name:'未完成'},{id:'1',name:'已完成'}],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        time: null, //申请时间
+        name: undefined,
+        status: undefined,
+        isFinish: 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],
+        isFinish: this.queryParams.isFinish,
+        typeId: this.queryParams.typeId,
+        pageSize: this.queryParams.pageSize,
+        pageNum: this.queryParams.pageNum,
+        statusList: [1],
+        taskStage: 1,
+      };
+      getListNewBuy(this.addDateRange(params)).then((response) => {
+        this.typeList = response.data.rows;
+        this.total = response.data.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);
+    },
+
+
+    // 表单重置
+    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,statusList: [1],taskStage: 1 },
+        `新购到货_${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/part/partArrived/component/queryTools.vue b/src/views/material/part/partArrived/component/queryTools.vue
new file mode 100644
index 00000000..3925e2bc
--- /dev/null
+++ b/src/views/material/part/partArrived/component/queryTools.vue
@@ -0,0 +1,350 @@
+<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="rentPrice"
+                :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: #02A7F0;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==0">报告管理</div>
+                <div style="color: red;cursor: pointer;" @click="openFileDialog(scope.row)" v-if="scope.row.isExitFile==1">报告管理</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,statusList:[1],taskStage: 1}).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/part/partArrived/index.vue b/src/views/material/part/partArrived/index.vue
new file mode 100644
index 00000000..fc4f1977
--- /dev/null
+++ b/src/views/material/part/partArrived/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <!-- 配件新购管理 -->
+  <div class="app-container">
+    <PageHeader
+      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 PageHeader from "@/components/pageHeader";
+import Home from "./component/home.vue"; // 主列表
+import AddTools from './component/addTools.vue' // 新增配件新购 和 修改配件新购
+import QueryTools from './component/queryTools.vue' // 查询配件新购 
+export default {
+  components: {
+    Home,
+    PageHeader,
+    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