diff --git a/src/utils/request.js b/src/utils/request.js
index 0e7d73f1..c09b5fd3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,26 +8,26 @@ export const name1 = `OP1000`
 export const name3 = `OP2000`
 export const name4 = `OP9999`
 
-export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice
-export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond
-export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement
-export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery
-export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond
-export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice
-export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
-export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement
-export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
-export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
-export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel
+export const readFile = `http://123.56.95.229:58010/webpage/file/` // invoice
+export const readImg = `http://123.56.95.229:58010/webpage/img/` // delivery/MS/performancebond
+export const upload = `http://123.56.95.229:58010/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `http://123.56.95.229:58010/submit/upload2.ashx` // delivery
+export const upload3 = `http://123.56.95.229:58010/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `http://123.56.95.229:58010/submit/uploadInvoiceScan.ashx` // invoice
+export const uploadInvoiceScan1 = `http://123.56.95.229:58010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
+export const download = `http://123.56.95.229:58010/submit/downloadFile.ashx` // ContractInformationManagement
+export const uploadPerson = `http://123.56.95.229:58010/submit/uploadPerson.ashx`
+export const uploadOP = `http://123.56.95.229:58010/submit/uploadOP.ashx`
+export const url = `http://123.56.95.229:58010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
+export const ExcelDownLoad = 'http://123.56.95.229:58010/submit/MESCommonBase.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
-export const ServerIP = `http://123.56.95.229:8010/webpage/file/`
-export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
-export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
-export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx`
-export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx`
+export const ServerIP = `http://123.56.95.229:58010/webpage/file/`
+export const uploadFileMachine = `http://123.56.95.229:58010/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
+export const downloadFileMachine = `http://123.56.95.229:58010/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
+export const MESUploadFile = `http://123.56.95.229:58010/submit/MESUploadFile.ashx`
+export const MESDownloadFile = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`,
+  baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index a91d38d0..aff18896 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -287,7 +287,7 @@
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="备注" prop="备注" align="center" min-width="130px">
+          <el-table-column label="机床" prop="备注" align="center" min-width="130px">
             <template slot-scope="scope">
               {{ scope.row.领料单备注 }}
             </template>
@@ -378,7 +378,7 @@
                   </el-table-column>
                   <el-table-column min-width="150" align="center" label="领料时间">
                     <template slot-scope="scope">
-                      {{ scope.row.操作日期 }}
+                      {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
                     </template>
                   </el-table-column>
                   <el-table-column min-width="100" align="center" label="数量" prop="出库数量">
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index a8e37752..f875001a 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -9,7 +9,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 0">审核时间:</span>
+      <span style="margin-left: 0">提交时间:</span>
       <el-date-picker
         v-model="dateRange"
         size="small"
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index 49e03418..abbd4aa5 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -84,11 +84,21 @@
                 {{ scope.row.报废时间 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="报废人" width="85px">
+              <template slot-scope="scope">
+                {{ scope.row.报废人 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="报废原因" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.报废原因 }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="操作工人" width="100px" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="报废备注" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index a2a0bbf9..0f2c0155 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -16,7 +16,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span style="margin-left: 0">审核时间:</span>
+      <span style="margin-left: 0">提交时间:</span>
       <el-date-picker
         v-model="dateRange"
         size="small"
diff --git a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
index 1f329507..40fd410c 100644
--- a/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
+++ b/src/views/ManufacturingCenter/ScrappedSupplementaryInvestment/index.vue
@@ -46,6 +46,7 @@
         style="width: 1390px; margin: 3px 0"
         size="mini"
         border
+        stripe
         highlight-current-row
         element-loading-text="拼命加载中"
         @selection-change="handleSelectionChange">
@@ -106,16 +107,16 @@
             {{ scope.row.不合格原因文本 }}
           </template>
         </el-table-column>
-        <el-table-column label="处理结果" align="center">
+        <el-table-column label="处理结果" align="center" width="100px">
           <template slot-scope="scope">
             {{ 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">
+          <template slot-scope="scope">
+            {{ scope.row.操作工 === '超级管理员' ? '' : scope.row.操作工 }}
+          </template>
+        </el-table-column>
         <el-table-column label="报废工时(分)" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.报废工时 }}
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index d42d9a97..4a9f2621 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -63,7 +63,7 @@
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目下达日期" prop="合同签订日期" width="120px">
+            <el-table-column align="center" label="项目创建日期" prop="合同签订日期" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.合同签订日期.substring(0,10) }}
               </template>
@@ -128,8 +128,8 @@
       </el-col>
     </el-row>
     <!--新增合同信息对话框-->
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="450px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="140px" class="demo-ruleForm">
         <el-row>
           <el-col :span="24">
             <el-form-item label="项目名称" prop="EntryName">
@@ -137,7 +137,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="项目下达日期" prop="contractSigningDate">
+            <el-form-item label="项目创建日期" prop="contractSigningDate">
               <el-date-picker
                 v-model="form.contractSigningDate"
                 style="width: 200px"
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index f59a4c38..33874106 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -38,7 +38,7 @@
     <!--    </el-card>-->
 
     <el-card>
-      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 60%;" height="210px" highlight-current-row @row-click="searchTable2">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 70%;" height="210px" highlight-current-row @row-click="searchTable2">
         <!--        <el-table-column type="expand" label="详情">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-form id="table" label-position="left" inline class="demo-table-expand">-->
@@ -100,7 +100,7 @@
             {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100" fixed="right">
+        <el-table-column label="操作" align="center" min-width="80" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
             <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 006f1965..7c573be1 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -98,7 +98,7 @@
           </el-table-column>
           <el-table-column align="center" label="利用库存数" width="100px">
             <template slot-scope="scope">
-              {{ scope.row.使用库存数 || '—' }}
+              {{ scope.row.使用库存数 ? scope.row.使用库存数 : '—' }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="采购数量" width="100px">
@@ -695,6 +695,7 @@ export default {
               零件数量: response.data.result[i].零件数量,
               数量: response.data.result[i].数量,
               离线采购数量: response.data.result[i].离线采购数量,
+              使用库存数: response.data.result[i].使用库存数,
               已到货数量: response.data.result[i].已到货数量,
               离线到货数量: response.data.result[i].离线到货数量,
               供应商名称: response.data.result[i].供应商名称,