diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js
index 846a683c..78f6b224 100644
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -325,3 +325,14 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig
     }
   })
 }
+export function searchMaterial1(num, name, Specifications) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_零件明细表_标准件和外购件_物料对比',
+      param: `图号或者型号=${num}&名称=${name}&规格=${Specifications}`
+    }
+  })
+}
diff --git a/src/api/WorkshopProcurement/ProjectTotalSearch.js b/src/api/WorkshopProcurement/ProjectTotalSearch.js
index dcc933bc..eb903600 100644
--- a/src/api/WorkshopProcurement/ProjectTotalSearch.js
+++ b/src/api/WorkshopProcurement/ProjectTotalSearch.js
@@ -12,18 +12,6 @@ export function initProject() {
   })
 }
 // 初始化项目金额统计表
-export function searchProjectTotal(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_项目总价_明细_查询数据',
-      param: `项目流水号=${num}`
-    }
-  })
-}
-// 初始化项目金额统计表
 export function searchProjectTotal1(num) {
   return request({
     url: '',
diff --git a/src/utils/request.js b/src/utils/request.js
index e3cc882a..f997ba78 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,17 +3,17 @@ import axios from 'axios'
 // import store from '../store'
 // import { getToken } from '@/utils/auth'
 
-export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const readFile = `192.168.1.212:8411/webpage/file/` // invoice
-export const readImg = `192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond
-export const upload = `192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `192.168.1.212:8411/submit/upload2.ashx` // delivery
-export const upload3 = `192.168.1.212:8411/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice
-export const download = `192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement
+export const readFile = `192.168.1.231:8411/webpage/file/` // invoice
+export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
+export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery
+export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
 const service = axios.create({
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index edcda24d..a0cc6236 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -105,11 +105,21 @@
                 {{ scope.row.零件备注 }}
               </template>
             </el-table-column>
+            <el-table-column label="库存数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.库存数量 }}
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="外购件">
           <el-table :data="tableData2" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
+            <el-table-column label="物料代码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.物料代码 }}
+              </template>
+            </el-table-column>
             <el-table-column label="物料名称" align="center">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
@@ -135,11 +145,26 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
+            <el-table-column label="库存数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.库存数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="标准件">
           <el-table :data="tableData3" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
+            <el-table-column label="物料代码" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.物料代码 }}
+              </template>
+            </el-table-column>
             <el-table-column label="物料名称" align="center">
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
@@ -165,6 +190,16 @@
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
+            <el-table-column label="库存数量" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.库存数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="120px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">使用</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
       </el-tabs>
@@ -176,7 +211,7 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">车间请购</el-button>
+      <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="purchaseRequisition()">制造部采购</el-button>
       <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="PurchasingDepartment()">采购部门采购</el-button>
       <el-button type="warning" size="small" icon="el-icon-star-off" style="margin-top: 15px; margin-left: 15px" @click="Production()">车间生产</el-button>
     </el-card>
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index e7c2a055..ead697a4 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -28,6 +28,11 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border>
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="图号" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.图号或者型号 }}
@@ -87,6 +92,11 @@
             </el-radio-group>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="旧图号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.前图号或者型号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
             <el-button
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index 3d830dee..8de899d1 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -236,9 +236,13 @@ export default {
           if (res[0].result === '0') {
             this.$notify.error(`${drawingNum}导入失败`)
           }
+          if (res[0].result === '2') {
+            this.$notify.error(`${drawingNum}导入重复`)
+          }
         } else {
           const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
           const res = response.data
+          console.log(res)
           if (res[0].result === '0') {
             this.$notify.error(`${drawingNum}导入失败`)
           }
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index ef6acb72..a62636bd 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -28,7 +28,13 @@
         :data="tableData"
         :row-class-name="tableRowClassName"
         size="mini"
-        border>
+        border
+        @row-click="searchMaterial1">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="物料状态" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
@@ -45,7 +51,7 @@
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="材料" width="200">
+        <el-table-column align="center" label="材料" width="150">
           <template slot-scope="scope">
             {{ scope.row.材料或者规格 }}
           </template>
@@ -111,6 +117,42 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
+    <el-card>
+      <el-table
+        :data="tableData10"
+        :cell-class-name="cell"
+        style="width: 100%"
+        height="440"
+        size="mini"
+        highlight-current-row
+        border>
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column align="center" label="物料名称">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料规格">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="物料型号">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供货商">
+          <template slot-scope="scope">
+            {{ scope.row.供货商 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
@@ -268,7 +310,7 @@
 
 <script>
 import { sleep } from '../../../utils/tool'
-import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete } from '../../../api/TechnologyCenter/ImportParts'
+import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete, searchMaterial1 } from '../../../api/TechnologyCenter/ImportParts'
 export default {
   name: 'SpecificationData',
   props: {
@@ -292,6 +334,7 @@ export default {
       machineValue: '',
       tableData: [],
       tableDataAll: [],
+      tableData10: [],
       listLoading: false,
       unSpecification: [],
       pageCurrent: 1,
@@ -367,6 +410,35 @@ export default {
     this.getSelect(getMaterial, ['材料', '材料流水号'], 'materials')
   },
   methods: {
+    cell({ row, column, rowIndex, columnIndex }) {
+      if (row.对比类型 === 1 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 2 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 2 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 3 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 4 && columnIndex === 3) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 5 && columnIndex === 1) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 5 && columnIndex === 3) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 6 && columnIndex === 2) {
+        return 'rgb196'
+      }
+      if (row.对比类型 === 6 && columnIndex === 3) {
+        return 'rgb196'
+      }
+    },
     async fetchData() {
       this.pageCurrent = 1
       try {
@@ -447,7 +519,7 @@ export default {
       this.editForm(row, 'form', [this.title = '编辑零件信息', this.dialogFormVisible = true])
       if (this.type === 2) {
         this.form.物料名称 = row.材料或者规格
-        this.form.物料物流号 = row.物料流水号
+        this.form.物料流水号 = row.物料流水号
       }
     },
     submitEdit() {
@@ -479,6 +551,13 @@ export default {
         })
       }
     },
+    searchMaterial1(row) {
+      console.log(row)
+      searchMaterial1(row.图号或者型号, row.名称, row.规格).then(response => {
+        this.tableData10 = response.data
+        console.log(response.data)
+      })
+    },
     materialShow() {
       this.inputMaterial = ''
       this.getMaterialWB()
@@ -577,6 +656,9 @@ export default {
   .el-table .warning-row {
     background: oldlace;
   }
+  .rgb196{
+    background: palevioletred;
+  }
 </style>
 
 <style scoped>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index ad110d6a..60b377d3 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -39,6 +39,11 @@
         size="mini"
         style="width: 100%;max-height: 520px"
         height="520">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
         <el-table-column
           label="机床图号"
           align="center"
@@ -83,6 +88,16 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.零件类型名称 }}</template>
         </el-table-column>
+        <el-table-column align="center" label="旧零件图号" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.旧零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="整改类型" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.整改类型 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-button
@@ -114,6 +129,10 @@
         height="600"
         highlight-current-row
         border>
+        <el-table-column
+          label="序号"
+          type="index"
+          width="50"/>
         <el-table-column align="center" label="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -277,8 +296,17 @@ export default {
         basicPartsData(project_check, this.projectValue, machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
           this.loading = false
           const res = response.data
-          this.tableData = res.rows
           this.total = res.total
+          this.tableData = res.rows.map(item => {
+            if (item.整改类型 === '1') {
+              item.整改类型 = '新增'
+            } else if (item.整改类型 === '2') {
+              item.整改类型 = '替换'
+            } else if (item.整改类型 === '3') {
+              item.整改类型 = '补充加工'
+            }
+            return item
+          })
         })
       } else {
         const type = this.groupName.indexOf('WG') > -1 ? 2 : 1