From 3397357a3e0cc50a07e9d73f774a8fb3e8b9d671 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Thu, 2 Apr 2020 18:25:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/DeliveryConfirmation.js      |  12 ++
 src/api/Inventory/OfflinePartOut.js           |   4 +-
 src/api/Inventory/StockInquiry.js             |   8 +-
 .../ContractApprovalQuery2.js                 |  46 +++++
 src/views/Assembly/MakeAssemblyPlan/index.vue |  42 ++++-
 .../Inventory/CreatePickingList/index.vue     |  20 +-
 src/views/Inventory/MaterialOut/index.vue     |  28 +--
 src/views/Inventory/OfflinePartOut/index.vue  |  49 +++--
 src/views/Inventory/StockInquiry/index.vue    |  80 +++++---
 .../ContractApprovalQuery1/index.vue          |   4 +-
 .../CreatePreparationBill/index.vue           |   2 +-
 .../ManufacturingCenter/StatusQuery/index.vue |  62 ++++---
 .../PurchasingCenter/ReceiveCheck/index.vue   |  56 +++---
 .../SupplierManagement/index.vue              | 158 ++++++++--------
 .../TechnologyCenter/QueryParts/index.vue     |  40 ++--
 .../ContractApprovalQuery2/index.vue          | 172 ++++++++++++++++++
 .../InvoiceSettlementApplication1/index.vue   |   5 +
 src/views/layout/components/Navbar.vue        |  22 ++-
 18 files changed, 578 insertions(+), 232 deletions(-)
 create mode 100644 src/api/WorkshopProcurement/ContractApprovalQuery2.js
 create mode 100644 src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue

diff --git a/src/api/Assembly/DeliveryConfirmation.js b/src/api/Assembly/DeliveryConfirmation.js
index ca552d76..07f275c0 100644
--- a/src/api/Assembly/DeliveryConfirmation.js
+++ b/src/api/Assembly/DeliveryConfirmation.js
@@ -54,3 +54,15 @@ export function reconfirmation() {
     }
   })
 }
+export function search() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '发货管理_发货确认_发货单申请提醒_查询'
+    }
+  })
+}
diff --git a/src/api/Inventory/OfflinePartOut.js b/src/api/Inventory/OfflinePartOut.js
index 3833f375..3328b542 100644
--- a/src/api/Inventory/OfflinePartOut.js
+++ b/src/api/Inventory/OfflinePartOut.js
@@ -73,7 +73,7 @@ export function searchPeople(data1) {
   })
 }
 // 离线件出库
-export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
+export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13, data14) {
   return request({
     url: '',
     method: 'post',
@@ -82,7 +82,7 @@ export function outlinePartOut(data2, data3, data4, data5, data6, data7, data8,
       ModularID: router.currentRoute.path,
       type: '2',
       name: '库存管理_离线采购件_零件出库',
-      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + '&领料部门=' + data13
+      param: '领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5 + '&项目流水号=' + data6 + '&机床流水号=' + data7 + '&组件流水号=' + data8 + '&物料流水号=' + data9 + '&出库人员流水号=' + data10 + '&离线合同明细流水号=' + data11 + '&组件零件基本件流水号=' + data12 + '&领料部门=' + data13 + '&备注1=' + data14
     }
   })
 }
diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js
index b1bca8ce..63c5fb73 100644
--- a/src/api/Inventory/StockInquiry.js
+++ b/src/api/Inventory/StockInquiry.js
@@ -31,7 +31,7 @@ export function getGroups(machineNumber) {
   })
 }
 // 主表查询
-export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
+export function getTable(num1, num2, num3, num4, num5, num6, num7, num8, num9, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -40,11 +40,11 @@ export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSi
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_库存管理_基本件库存查询',
-      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + '&时间_check=' + num7 + '&开始时间=' + num8 + '&结束时间=' + num9 + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
-export function getTable1(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
+export function getTable1(num1, num2, num3, num4, num5, num6, num7, num8, num9, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -53,7 +53,7 @@ export function getTable1(num1, num2, num3, num4, num5, num6, pageCurrent, pageS
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_库存管理_基本件出库记录查询',
-      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + '&时间_check=' + num7 + '&开始时间=' + num8 + '&结束时间=' + num9,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/WorkshopProcurement/ContractApprovalQuery2.js b/src/api/WorkshopProcurement/ContractApprovalQuery2.js
new file mode 100644
index 00000000..49f9bfd2
--- /dev/null
+++ b/src/api/WorkshopProcurement/ContractApprovalQuery2.js
@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+// 初始化采购员
+export function initBuyer() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '人事档案管理_人员与角色_查询数据_采购员'
+    }
+  })
+}
+// 采购合同查询
+export function searchTable1(radio, check1, supplier, check2, start, end, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间采购管理_合同审批查询_查询数据',
+      param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 采购合同明细查询
+export function searchTable2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_采购合同内容_查询数据',
+      param: '采购合同流水号=' + num
+    }
+  })
+}
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 6258d4dc..a9e4f0e7 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -33,8 +33,8 @@
         </div>
       </div>
     </el-card>
-    <el-card style="width: 39%; float: left">
-      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 515px;margin-top: 15px" height="720px" @row-click="searchTable2">
+    <el-card style="width: 47%; float: left">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 620px;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -55,10 +55,15 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="计划装配完成" align="center" width="110px">
+          <template slot-scope="scope">
+            {{ scope.row.机床装配完成时间 ? scope.row.机床装配完成时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
-    <el-card style="width: 61%; float: left">
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 525px;margin-top: 15px" height="720px" @row-dblclick="changeState" @row-click="deleteData1">
+    <el-card style="width: 51%; float: left">
+      <el-table :data="tableData2" :summary-method="getSummaries" border size="mini" highlight-current-row style="width: 525px;margin-top: 15px" height="720px" show-summary @row-dblclick="changeState" @row-click="deleteData1">
         <el-table-column label="组号" align="center" width="120px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
@@ -85,7 +90,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="计划工时" align="center" width="100px">
+        <el-table-column label="计划工时(分)" align="center" width="120px" prop="计划工时">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-input v-model="scope.row.计划工时" size="mini" style="width: 100%" props="" @input="filterNuber(scope.row.计划工时, scope.$index, '计划工时')"/>
@@ -183,6 +188,33 @@ export default {
         })
       }
     },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        if (index === 2) {
+          const values = data.map(item => Number(item['计划工时']))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ' 分'
+          } else {
+            sums[index] = ''
+          }
+        }
+      })
+      return sums
+    },
     changeState(row) {
       row.edit = !row.edit
     },
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 34caf125..55db3906 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -292,6 +292,11 @@
               {{ scope.row.领料单备注 }}
             </template>
           </el-table-column>
+          <el-table-column label="创建日期" prop="创建日期" align="center" min-width="90px">
+            <template slot-scope="scope">
+              {{ scope.row.操作日期 ? scope.row.操作日期.split(' ')[0] : '' }}
+            </template>
+          </el-table-column>
         </el-table>
         <div class="block" style="float:left;margin: 10px 0;">
           <el-pagination
@@ -308,7 +313,13 @@
     <div style="width: 72.5%;float: left">
       <el-card>
         <el-table v-loading="listDetailsloading" :data="pickListTable2" border style="width: 100%;" size="mini" highlight-current-row height="447px" @row-click="searchMX">
-          <el-table-column label="序号" align="center" type="index" width="50"/>
+          <el-table-column v-if="true" label="状态" align="center" prop="是否领料确认" width="70px">
+            <template slot-scope="scope">
+              <span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
+              <span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
+              <span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
+            </template>
+          </el-table-column>
           <el-table-column label="名称" align="center" prop="名称" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.名称 }}
@@ -355,13 +366,6 @@
           <!--<el-tag v-else type="warning" size="mini">未备料</el-tag>-->
           <!--</template>-->
           <!--</el-table-column>-->
-          <el-table-column v-if="true" label="确认" align="center" prop="是否领料确认" width="70px">
-            <template slot-scope="scope">
-              <span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
-              <span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
-              <span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
-            </template>
-          </el-table-column>
           <el-table-column label="操作" align="center" min-width="120px">
             <template slot-scope="scope">
               <el-popover placement="right" width="500" trigger="click">
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 2f84e1a2..0d54a0a9 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div style="margin-top: 8px;margin-bottom: 8px">
+      <div style="margin-top: 2px;margin-bottom: 2px">
         <!--<span style="margin: 5px">领料单编号:</span>-->
         <el-input v-model="pickingListNumber" placeholder="领料单编号或领料人" clearable size="small" style="width:200px" />
         <span style="margin: 5px">创建时间:</span>
@@ -17,23 +17,23 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
         <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
-        <el-button :disabled="审批未通过===true" size="small" style="float: right; margin-right: 30px" type="distribution" @click="inputPassword()">领料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
-    <div style="width: 29%;float: left;margin-right: 10px">
+    <div style="width: 21%;float: left;margin-right: 10px">
       <el-card>
         <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="570px" @row-click="clickList">
-          <el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="100px">
+          <el-table-column prop="领料单编号" label="领料单编号" show-overflow-tooltip align="center" width="95px">
             <template slot-scope="scope">
               {{ scope.row.领料单编号 }}
             </template>
           </el-table-column>
-          <el-table-column label="领料人" prop="领料人" show-overflow-tooltip align="center" min-width="60px">
+          <el-table-column label="领料人" prop="领料人" show-overflow-tooltip align="center" width="65px">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="90px">
+          <el-table-column label="备注" prop="备注" show-overflow-tooltip align="center" min-width="70px">
             <template slot-scope="scope">
               {{ scope.row.领料单备注 }}
             </template>
@@ -51,7 +51,7 @@
         </div>
       </el-card>
     </div>
-    <div style="width: 70%;float: left">
+    <div style="width: 62%;float: left">
       <el-card>
         <el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
           <el-table-column type="selection" align="center" width="45"/>
@@ -70,7 +70,7 @@
               {{ scope.row.规格 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column label="领用" align="center" width="70">
+          <el-table-column label="领用" align="center" width="50">
             <template slot-scope="scope">
               {{ scope.row.总数量 }}
             </template>
@@ -80,17 +80,17 @@
               <el-input-number :disabled="Number(scope.row.总数量) <= Number(scope.row.出库数量1) || scope.row.货位存量1 === null" :max="scope.row.货位存量1" v-model="scope.row.出库数量" size="mini" style="width: 100%"/>
             </template>
           </el-table-column>
-          <el-table-column label="备件" align="center" width="70">
+          <el-table-column label="备件" align="center" width="50">
             <template slot-scope="scope">
               {{ scope.row.备件数量 }}
             </template>
           </el-table-column>
-          <el-table-column label="库存" align="center" width="70">
+          <el-table-column label="库存" align="center" width="50">
             <template slot-scope="scope">
               {{ scope.row.货位存量1 }}
             </template>
           </el-table-column>
-          <el-table-column label="已领" align="center" width="70">
+          <el-table-column label="已领" align="center" width="50">
             <template slot-scope="scope">
               {{ scope.row.出库数量1 }}
             </template>
@@ -108,7 +108,7 @@
           <!--              <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领</el-tag>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
-          <el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
+          <el-table-column label="机床图号" prop="机床图号" align="center" width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
@@ -189,8 +189,8 @@
     </el-dialog>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="领料确认" center width="380px">
-      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left">
-        <el-form-item label="出库类别" prop="outTypeValue" label-width="100px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="right">
+        <el-form-item label="出库类别" prop="outTypeValue" label-width="100px" size="small">
           <el-select v-model="form3.outTypeValue" size="small" placeholder="出库类别" style="width: 200px;margin-right:10px">
             <el-option
               v-for="item in outType"
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index ba51dbda..0cd5a83a 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-row style="margin: 5px">
-        <span>名称规格型号：</span>
+      <el-row style="margin: 3px">
+        <!--        <span>名称规格型号：</span>-->
         <el-input v-model="materialName" placeholder="名称规格型号" clearable size="small" @keyup.enter.native="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()"/>
         <!--<span>物料规格：</span>-->
         <!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
@@ -13,19 +13,19 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 100%;" height="600" @row-click="searchoutRecord">
+      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width:63%;" height="600" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="物料名称" prop="物料名称" align="center" min-width="120">
+        <el-table-column label="物料名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" prop="物料型号" align="center" min-width="120">
+        <el-table-column label="物料型号" prop="物料型号" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" prop="物料规格" align="center" min-width="120">
+        <el-table-column label="物料规格" prop="物料规格" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
@@ -35,17 +35,17 @@
         <!--{{ scope.row.仓库名称 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="货位名称" align="center" min-width="80">
+        <el-table-column label="货位名称" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.货位名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="可出库数量" align="center" min-width="80">
+        <el-table-column label="可出库数量" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
             <!--<el-button size="mini" type="success" icon="el-icon-search" @click="pageCurrent2=1;pageSize2=10;total2=0;searchoutRecord(scope.row)">查看领用情况</el-button>-->
             <el-button :disabled="Number(scope.row.货位存量)===0" size="mini" plain type="primary" icon="el-icon-sort-up" @click="parOut(scope.row)">出库</el-button>
@@ -138,9 +138,9 @@
     </el-card>
     <!--零件出库对话框-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="零件出库" center width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left">
-        <el-form-item label="项目" prop="ProjectValue" label-width="100px">
-          <el-select v-model="form.ProjectValue" filterable size="small" placeholder="项目" style="width: 200px;margin-right:10px" @change="searchMachine()">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right">
+        <el-form-item label="项目" prop="ProjectValue" label-width="100px" size="small">
+          <el-select v-model="form.ProjectValue" filterable size="small" placeholder="项目" style="width: 200px" @change="searchMachine()">
             <el-option
               v-for="item in Project"
               :key="item.value"
@@ -148,8 +148,8 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="机床" prop="MachineValue" label-width="100px">
-          <el-select v-model="form.MachineValue" filterable size="small" placeholder="机床" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+        <el-form-item label="机床" prop="MachineValue" label-width="100px" size="small">
+          <el-select v-model="form.MachineValue" filterable size="small" placeholder="机床" style="width: 200px" @change="searchGroupList()">
             <el-option
               v-for="item in Machine"
               :key="item.value"
@@ -190,7 +190,7 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px">
+        <el-form-item label="人员编号" prop="DirectNoteCode" label-width="100px" size="small">
           <el-input v-model="form.DirectNoteCode" size="small" placeholder="请输入人员编号" style="width: 200px"/>
         </el-form-item>
         <!--        <el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
@@ -481,4 +481,23 @@ export default {
   .el-input{
     width:200px
   }
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 30px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
 </style>
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 6c93e6ff..045b2aa0 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -19,6 +19,17 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
+      <el-date-picker
+        v-model="dateRange"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 250px;margin-left: 10px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
       <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=100;total = 0;pageCurrent0=1;pageSize0=100;total0 = 0;getTableData();getTableData0()">查询</el-button>
     </el-card>
 
@@ -138,6 +149,7 @@ export default {
       Group: '',
       Groups: [],
       number: '',
+      dateRange: '', // 日期
       checkbox_Machine: false,
       checkbox_Group: false,
       checkbox_number: false,
@@ -188,36 +200,48 @@ export default {
     },
     // 按条件查询
     getTableData() {
-      this.listLoading1 = true
-      this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
-      this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
-      this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
-      this.tableData1 = []
-      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
-        if (response.data.result.length === 0) {
-          this.listLoading1 = false
-        } else {
-          this.tableData1 = response.data.result
-          this.total = parseInt(response.data.output[0].ItemCount)
-          this.listLoading1 = false
-        }
-      })
+      if (this.Machine || this.Group || this.number || this.dateRange) {
+        this.listLoading1 = true
+        let check2
+        this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
+        this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
+        this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
+        this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+        this.tableData1 = []
+        getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent, this.pageSize).then(response => {
+          if (response.data.result.length === 0) {
+            this.listLoading1 = false
+          } else {
+            this.tableData1 = response.data.result
+            this.total = parseInt(response.data.output[0].ItemCount)
+            this.listLoading1 = false
+          }
+        })
+      } else {
+        this.$message.warning('请输入查询条件')
+      }
     },
     getTableData0() {
-      this.listLoading2 = true
-      this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
-      this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
-      this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
-      this.tableData0 = []
-      getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent0, this.pageSize0).then(response => {
-        if (response.data.total === 0) {
-          this.listLoading2 = false
-        } else {
-          this.tableData0 = response.data.rows
-          this.total0 = response.data.total
-          this.listLoading2 = false
-        }
-      })
+      if (this.Machine || this.Group || this.number || this.dateRange) {
+        this.listLoading2 = true
+        let check2
+        this.Machine ? this.checkbox_Machine = 1 : this.checkbox_Machine = 0
+        this.Group ? this.checkbox_Group = 1 : this.checkbox_Group = 0
+        this.number ? this.checkbox_number = 1 : this.checkbox_number = 0
+        this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+        this.tableData0 = []
+        getTable1(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent0, this.pageSize0).then(response => {
+          if (response.data.total === 0) {
+            this.listLoading2 = false
+          } else {
+            this.tableData0 = response.data.rows
+            this.total0 = response.data.total
+            this.listLoading2 = false
+          }
+        })
+      } else {
+        this.$message.warning('请输入查询条件')
+      }
     },
     handleSizeChange(val) {
       this.pageCurrent = 1
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
index 31dfc8d5..78acc940 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue
@@ -97,14 +97,14 @@
       </div>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="370px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="900px">
       <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery'
+import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/ContractApprovalQuery1'
 
 export default {
   data() {
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index ceee3692..0a3d0d9d 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,7 +4,7 @@
       <div style="white-space: nowrap">
         <el-card>
           <el-row>
-            <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:180px;margin: 3px 0"/>
+            <el-input v-model="partName" placeholder="零件图号或名称" size="small" clearable style="width:180px;margin: 3px 0"/>
             <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
             <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index d5b7f46e..eaccdc46 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -142,7 +142,6 @@ export default {
   },
   created() {
     this.fetchData()
-    this.searchData()
   },
   methods: {
     fetchData() {
@@ -179,35 +178,40 @@ export default {
       }
     },
     searchData() {
-      var check1, check2, check3, check4, check5
-      if (this.machineToolValue) { check1 = 1 } else { check1 = 0 }
-      if (this.groupNumberValue) { check2 = 1 } else { check2 = 0 }
-      if (this.partNumber) { check3 = 1 } else { check3 = 0 }
-      if (this.partStateValue) { check4 = 1 } else { check4 = 0 }
-      if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
-      this.loading0 = true
-      searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.result.length; i++) {
-          if (response.data.result[i].考核状态 === 3) {
-            response.data.result[i].考核状态 = 1
-          } else if (response.data.result[i].考核状态 === 4) {
-            response.data.result[i].考核状态 = 2
-          } else if (response.data.result[i].考核状态 === 5) {
-            response.data.result[i].考核状态 = 2
-          } else if (response.data.result[i].考核状态 === 6) {
-            response.data.result[i].考核状态 = 2
-          } else if (response.data.result[i].考核状态 === 7) {
-            response.data.result[i].考核状态 = 3
-          } else if (response.data.result[i].考核状态 === 8) {
-            response.data.result[i].考核状态 = 4
-          } else if (response.data.result[i].考核状态 === 9) {
-            response.data.result[i].考核状态 = 5
+      if (this.machineToolValue || this.groupNumberValue || this.partNumber || this.partStateValue || this.partTypeValue) {
+        var check1, check2, check3, check4, check5
+        if (this.machineToolValue) { check1 = 1 } else { check1 = 0 }
+        if (this.groupNumberValue) { check2 = 1 } else { check2 = 0 }
+        if (this.partNumber) { check3 = 1 } else { check3 = 0 }
+        if (this.partStateValue) { check4 = 1 } else { check4 = 0 }
+        if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
+        this.loading0 = true
+        searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
+          for (let i = 0; i < response.data.result.length; i++) {
+            if (response.data.result[i].考核状态 === 3) {
+              response.data.result[i].考核状态 = 1
+            } else if (response.data.result[i].考核状态 === 4) {
+              response.data.result[i].考核状态 = 2
+            } else if (response.data.result[i].考核状态 === 5) {
+              response.data.result[i].考核状态 = 2
+            } else if (response.data.result[i].考核状态 === 6) {
+              response.data.result[i].考核状态 = 2
+            } else if (response.data.result[i].考核状态 === 7) {
+              response.data.result[i].考核状态 = 3
+            } else if (response.data.result[i].考核状态 === 8) {
+              response.data.result[i].考核状态 = 4
+            } else if (response.data.result[i].考核状态 === 9) {
+              response.data.result[i].考核状态 = 5
+            }
           }
-        }
-        this.loading0 = false
-        this.total = parseInt(response.data.output[0].ItemCount)
-        this.tableData = response.data.result
-      })
+          this.loading0 = false
+          this.total = parseInt(response.data.output[0].ItemCount)
+          this.tableData = response.data.result
+        })
+      } else {
+        this.$message.warning('请输入查询条件')
+        this.tableData = []
+      }
     },
     handleSizeChange(val) {
       this.pageSize = val
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index af7c5382..ec99731e 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -29,14 +29,14 @@
         <!--            :label="item.label"-->
         <!--            :value="item.value"/>-->
         <!--        </el-select>-->
-        <span>组号:</span>
-        <el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>
-          <el-option
-            v-for="item in group"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <!--<span>组号:</span>-->
+        <!--<el-select v-model="groupValue" style="width:140px" placeholder="请选择" size="small" clearable filterable>-->
+        <!--<el-option-->
+        <!--v-for="item in group"-->
+        <!--:key="item.value"-->
+        <!--:label="item.label"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
         <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="searchProject()">查询</el-button>
         <el-tooltip v-show="true" :open-delay="1000" effect="dark" content="导出领用核算表" placement="top">
           <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 50px 0px 10px" @click="exportExcel">导出</el-button>
@@ -272,25 +272,29 @@ export default {
       // if (!this.projectValue) {
       //   this.$message.error('请选择项目')
       // } else {
-      let check2, check3, check4
-      this.machine ? check2 = 1 : check2 = 0
-      this.groupValue ? check3 = 1 : check3 = 0
-      this.machinenum ? check4 = 1 : check4 = 0
-      this.loading = true
-      searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize, this.order, this.partName).then(response => {
-        this.tableData1 = response.data.result
-        // for (let i = 0; i <= response.data.rows.length; i++) {
-        //   this.totalPrice = (Number(this.totalPrice) + Number(response.data.rows[i].数量) * Number(response.data.rows[i].单价)).toFixed(2)
-        // }
-        this.total = parseInt(response.data.output[0].ItemCount)
+      if (this.machinenum) {
+        let check2, check3, check4
+        this.machine ? check2 = 1 : check2 = 0
+        this.groupValue ? check3 = 1 : check3 = 0
+        this.machinenum ? check4 = 1 : check4 = 0
+        this.loading = true
+        searchReceiveCheck(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum, this.pageCurrent, this.pageSize, this.order, this.partName).then(response => {
+          this.tableData1 = response.data.result
+          // for (let i = 0; i <= response.data.rows.length; i++) {
+          //   this.totalPrice = (Number(this.totalPrice) + Number(response.data.rows[i].数量) * Number(response.data.rows[i].单价)).toFixed(2)
+          // }
+          this.total = parseInt(response.data.output[0].ItemCount)
+          this.loading = false
+        }).then(() => {
+          searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => {
+            console.log(res.data, 121)
+            this.totalPrice = Number(res.data[0].合计).toFixed(2)
+          })
+        }).catch(() => {})
         this.loading = false
-      }).then(() => {
-        searchsum(0, this.projectValue, check2, this.machine, check3, this.groupValue, check4, this.machinenum).then(res => {
-          console.log(res.data, 121)
-          this.totalPrice = Number(res.data[0].合计).toFixed(2)
-        })
-      }).catch(() => {})
-      this.loading = false
+      } else {
+        this.$message.warning('请输入查询条件')
+      }
     },
     handleSizeChange(val) { // 基本件列表分页
       this.pageSize = val
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index dfb575ba..93535d63 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -190,20 +190,31 @@
       </el-table>
     </el-card>
 
-    <el-dialog v-el-drag-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">
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="650px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="70px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="供应商名称" prop="供应商名称">
+          <el-col :span="24">
+            <el-form-item label="供应商" prop="供应商名称" size="small">
               <el-input
                 v-model="form.供应商名称"
                 size="small"
-                style="width: 200px;"
+                style="width: 500px;"
                 clearable/>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <!--          <el-col :span="12">-->
+          <!--            <el-form-item label="邮编" prop="货期">-->
+          <!--              <el-input-->
+          <!--                v-model="form.货期"-->
+          <!--                size="small"-->
+          <!--                style="width: 200px;"-->
+          <!--                clearable/>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="法人" prop="企业性质">
+            <el-form-item label="法人" prop="企业性质" size="small">
               <el-input
                 v-model="form.企业性质"
                 size="small"
@@ -211,79 +222,8 @@
                 clearable/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="邮编" prop="货期">
-              <el-input
-                v-model="form.货期"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="受托人" prop="注册资本">
-              <el-input
-                v-model="form.注册资本"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="税号" prop="税号">
-              <el-input
-                v-model="form.税号"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行" prop="开户行">
-              <el-input
-                v-model="form.开户行"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="帐号" prop="帐号">
-              <el-input
-                v-model="form.帐号"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电子信箱" prop="电子信箱">
-              <el-input
-                v-model="form.电子信箱"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="地址" prop="地址">
-              <el-input
-                v-model="form.地址"
-                size="small"
-                style="width: 200px;"
-                clearable/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="电话号码" prop="电话号码">
+            <el-form-item label="电话号码" prop="电话号码" size="small">
               <el-input
                 v-model="form.电话号码"
                 size="small"
@@ -294,7 +234,67 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="传真" prop="传真">
+            <el-form-item label="税号" prop="税号" size="small">
+              <el-input
+                v-model="form.税号"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="受托人" prop="注册资本" size="small">
+              <el-input
+                v-model="form.注册资本"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="帐号" prop="帐号" size="small">
+              <el-input
+                v-model="form.帐号"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="开户行" prop="开户行" size="small">
+              <el-input
+                v-model="form.开户行"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="地址" size="small">
+              <el-input
+                v-model="form.地址"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="电子信箱" prop="电子信箱" size="small">
+              <el-input
+                v-model="form.电子信箱"
+                size="small"
+                style="width: 200px;"
+                clearable/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="传真" prop="传真" size="small">
               <el-input
                 v-model="form.传真"
                 size="small"
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 39ac82c3..2c791570 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -358,25 +358,29 @@ export default {
     getTableData() {
       this.getFileData(this.machineValue)
       console.log(this.hadFile, 88899)
-      const machine_check = this.machineValue ? 1 : 0
-      const group_check = this.groupValue ? 1 : 0
-      this.loading = true
-      basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
-        this.loading = false
-        const res = response.data
-        this.total = res.total
-        console.log(this.tableData)
-        this.tableData = res.rows.map(item => {
-          if (item.整改类型 === '1') {
-            item.整改类型 = '新增'
-          } else if (item.整改类型 === '2') {
-            item.整改类型 = '替换'
-          } else if (item.整改类型 === '3') {
-            item.整改类型 = '补充加工'
-          }
-          return item
+      if (this.machineValue) {
+        const machine_check = this.machineValue ? 1 : 0
+        const group_check = this.groupValue ? 1 : 0
+        this.loading = true
+        basicPartsData(machine_check, this.machineValue, group_check, this.groupValue, this.pageSize, this.pageCurrent).then(response => {
+          this.loading = false
+          const res = response.data
+          this.total = res.total
+          console.log(this.tableData)
+          this.tableData = res.rows.map(item => {
+            if (item.整改类型 === '1') {
+              item.整改类型 = '新增'
+            } else if (item.整改类型 === '2') {
+              item.整改类型 = '替换'
+            } else if (item.整改类型 === '3') {
+              item.整改类型 = '补充加工'
+            }
+            return item
+          })
         })
-      })
+      } else {
+        this.$message.warning('请输入查询条件')
+      }
       this.loadingWB = true
       purchasePartsData(this.groupValue, this.pageCurrentWB, this.pageSizeWB).then(response => {
         this.loadingWB = false
diff --git a/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue b/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue
new file mode 100644
index 00000000..fb64b54b
--- /dev/null
+++ b/src/views/WorkshopProcurement/ContractApprovalQuery2/index.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>
+      <span style="margin-left: 0">审批时间:</span>
+      <el-date-picker
+        v-model="dateRange"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 300px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
+      <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
+      <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
+      <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
+      <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
+    </el-card>
+    <el-card style="margin-top: 5px">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
+        <el-table-column label="采购合同编号" align="center" min-width="130">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购员" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="合同金额(元)" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.总金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批人" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批人姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批结果" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批情况内容 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="90px" fixed="right">
+          <template slot-scope="scope">
+            <el-tooltip :open-delay="1000" effect="dark" content="查看详情" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" @click="searchTable2(scope.row)">详情</el-button>
+              </div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="pageCurrent1"
+          :page-sizes="[50, 100, 150, 200]"
+          :page-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="900px">
+      <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { searchTable1, searchTable2 } from '@/api/WorkshopProcurement/ContractApprovalQuery2'
+
+export default {
+  data() {
+    return {
+      radio: '1',
+      billNames: '',
+      person: [],
+      personValue: '',
+      dateRange: '',
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 50,
+      tableData1: [],
+      loading1: false,
+      dialogFormVisible: false,
+      returns: ''
+    }
+  },
+  created() {
+    this.searchTable1()
+  },
+  methods: {
+    searchTable1() {
+      this.loading1 = true
+      var check1, check2
+      this.billNames ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], this.pageCurrent1, this.pageSize1).then(response => {
+        this.loading1 = false
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    exportTable() {
+      var check1, check2, check3
+      this.billNames ? check1 = 1 : check1 = 0
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      this.personValue ? check3 = 1 : check3 = 0
+      var param = []
+      param[0] = ['查询全部', this.radio]
+      param[1] = ['供应商名称_check', check1]
+      param[2] = ['供应商名称', this.billNames]
+      param[3] = ['时间段_check', check2]
+      if (check2 === 0) {
+        param[4] = ['开始时间', '']
+        param[5] = ['结束时间', '']
+      } else {
+        param[4] = ['开始时间', this.dateRange[0]]
+        param[5] = ['结束时间', this.dateRange[1]]
+      }
+      param[6] = ['人员编号_check', check3]
+      param[7] = ['人员编号', this.personValue]
+      var Data = this.CreateData('2001', '报表_采购管理_合同审核查询_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
+    searchTable2(row) {
+      this.contractValue = parseInt(row.采购合同流水号)
+      searchTable2(this.contractValue).then(response => {
+        this.returns = response.data[0].合同内容
+        this.dialogFormVisible = true
+      })
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
+<style>
+  #table .el-form-item {
+    margin: 0;
+  }
+</style>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 7b58330b..a449ad37 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -102,6 +102,11 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
+        <el-table-column label="备注" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" @click="submitApply(scope.row)">提交申请</el-button>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 299762c6..7d675dac 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -35,6 +35,7 @@ import { searchTable1 as searchTableInvoice } from '@/api/PurchasingCenter/Invoi
 import { RequestFund, setChakan2 } from '@/api/PurchasingCenter/PurchaseContractRequestFund'
 import { getPickingList, setPickingList } from '@/api/Inventory/MaterialOut'
 import { searchTable } from '@/api/PurchasingCenter/PurchaseMaterielModify'
+import { search } from '@/api/Assembly/DeliveryConfirmation'
 export default {
   components: {
     Breadcrumb,
@@ -53,7 +54,8 @@ export default {
       noticeContractJJ: null,
       noticeFund: null,
       noticeInvoice: null,
-      noticeContractKG: null
+      noticeContractKG: null,
+      noticeDeliver: null
     }
   },
   computed: {
@@ -84,6 +86,9 @@ export default {
     } else if (this.token.toString() === '5') {
       this.comfirmUrgentItem()
       this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5)
+    } else if (this.token.toString() === '21') {
+      this.comfirmDeliver()
+      this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5)
     }
   },
   beforeDestroy() {
@@ -277,6 +282,21 @@ export default {
         }
       })
     },
+    comfirmDeliver() {
+      search().then(res => {
+        if (res.data.length > 0) {
+          this.noticeDeliver = null
+          this.noticeDeliver = this.$notify.success({
+            title: '提示',
+            message: '有发货申请，请及时处理',
+            onClick: () => {
+              setTimeout(this.noticeDeliver.close(), 1000)
+            },
+            duration: 1000 * 60
+          })
+        }
+      })
+    },
     toggleSideBar() {
       this.$store.dispatch('ToggleSideBar')
     },