Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

2019-04-16 10:35:12 +08:00
parent b219eb7978 eac3ca8472
commit 5f2d820671
16 changed files with 349 additions and 308 deletions
--- a/src/api/PurchasingCenter/PurchaseTaskAllocate.js
+++ b/src/api/PurchasingCenter/PurchaseTaskAllocate.js
@@ -53,7 +53,7 @@ export function searchTable1(...params) {
    data: {
      type: '1',
      name: '采购管理_采购部采购_查询物料',
-      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}`,
+      param: `物料类别流水号_check=${params[2]}&物料类别流水号=${params[3]}&物料品种流水号_check=${params[4]}&物料品种流水号=${params[5]}&项目流水号_check=${params[6]}&项目流水号=${params[7]}&物料名称_check=${params[8]}&物料名称=${params[9]}&物料状态=${params[10]}&物料规格_check=${params[11]}&物料规格=${params[12]}&物料型号_check=${params[13]}&物料型号=${params[14]}`,
      Pagination: params[0] + '&' + params[1]
    }
  })
@@ -66,7 +66,7 @@ export function searchTable2(...params) {
    data: {
      type: '1',
      name: '采购管理_采购部采购_查询物料_基本件',
-      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}`,
+      param: `项目流水号_check=${params[2]}&项目流水号=${params[3]}&物料状态=${params[4]}&零件图号_check=${params[5]}&零件图号=${params[6]}&零件名称_check=${params[7]}&零件名称=${params[8]}&规格_check=${params[9]}&规格=${params[10]}&材料_check=${params[11]}&材料=${params[12]}`,
      Pagination: params[0] + '&' + params[1]
    }
  })
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -467,7 +467,7 @@ export default {
      EducationDate: [],
      PostData: [],
      multipleSelection: [],
-      nodeName1: [],
+      nodeName1: '',
      count1: 0,
      count2: 0
    }
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -1,10 +1,12 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>物料名称：</span>
-      <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
-      <span>物料规格：</span>
-      <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+      <el-row style="margin-bottom: 10px">
+        <span>物料名称：</span>
+        <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
+        <span>物料规格：</span>
+        <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+      </el-row>
      <span>物料型号：</span>
      <el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
--- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
+++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue
@@ -1,28 +1,27 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>合同号:</span>
-      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
-        <el-option
-          v-for="item in contractNum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-        </el-option>
-      </el-select>
-      <span>供应商:</span>
-      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-    </el-card>
-
-    <el-card>
+      <div slot="header">
+        <span>合同号:</span>
+        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
+          <el-option
+            v-for="item in contractNum"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <span>供应商:</span>
+        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+        <el-button
+          type="success"
+          size="small"
+          icon="el-icon-search"
+          style="margin-left:10px"
+          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      </div>
      <el-table
        v-loading=""
        :data="tableData1"
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -2,10 +2,12 @@
  <div class="app-container">
    <el-card>
      <div slot="header" class="clearfix">
-        <span>物料名称：</span>
-        <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
-        <span>物料规格：</span>
-        <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+        <el-row style="margin-bottom: 10px">
+          <span>物料名称：</span>
+          <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
+          <span>物料规格：</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>
+        </el-row>
        <span>物料型号：</span>
        <el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>
        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -3,10 +3,12 @@
    <el-tabs type="border-card" @tab-click="searchTable11();searchTable12()">
      <el-tab-pane label="标准件和外购件">
        <el-row style="margin-bottom: 10px">
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
          <span>物料名称:</span>
          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+        </el-row>
+        <el-row style="margin-bottom: 10px">
          <span>物料规格:</span>
          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
          <span>物料型号:</span>
@@ -142,10 +144,12 @@
      </el-tab-pane>
      <el-tab-pane label="基本件">
        <el-row style="margin-bottom: 10px">
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
          <span>零件图号:</span>
          <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+        </el-row>
+        <el-row style="margin-bottom: 10px">
          <span>零件名称:</span>
          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
          <span>零件规格:</span>
@@ -266,15 +270,13 @@
        <el-button
          type="primary"
          size="small"
-          icon="el-icon-plus"
          style="margin-left: 10px"
-          @click="createInquirySheet">创建单据</el-button>
+          @click="createInquirySheet">创建询价单</el-button>
        <el-button
          type="primary"
          size="small"
-          icon="el-icon-circle-plus-outline"
          style="margin-left: 10px"
-          @click="addInquirySheet">追加物料</el-button>
+          @click="addInquirySheet">选入</el-button>
      </div>
      <h3 style="margin-top: 0">询价单</h3>
      <el-table v-loading="" :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -73,7 +73,7 @@
          </el-col>
        </el-row>
      </el-form>
-      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 300px;" height="300px" size="mini" show-summary>
+      <el-table :data="tableData1" border style="margin: 10px 0;max-height: 480px;" height="480px" size="mini" show-summary>
        <el-table-column label="序号" align="center" width="50" type="index"/>
        <el-table-column label="交货期" align="center" width="150">
          <template slot-scope="scope">
@@ -129,26 +129,24 @@
          </template>
        </el-table-column>
      </el-table>
-      <span>合同模板：</span>
+      <span>①选择合同模板：</span>
      <el-radio-group v-model="demoRadio" size="small" @change="demoChange">
        <el-radio-button label="模板1"/>
-        <el-radio-button label="模板2"/>
-        <el-radio-button label="模板3"/>
-        <el-radio-button label="自定义"/>
+        <el-radio-button label="模板2" disabled/>
+        <!--<el-radio-button label="自定义" disabled/>-->
      </el-radio-group>
      <el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
-      <span>合同总额：</span>
+      <span>②确认合同总额：</span>
      <el-input v-model="actualTotal" size="small" style="width: 100px"/>
-      <el-button type="primary" size="small" @click="submitTotal()">确定总额</el-button>
-      <div style="float: right">
-        <el-button type="success" size="small" @click="generateContract()">递交审批</el-button>
-      </div>
+      <el-button type="primary" size="small" @click="submitTotal()">确认</el-button>
+      <span>③递交审批：</span>
+      <el-button type="success" size="small" @click="generateContract()">递交</el-button>
      <hr>
      <!--html代码-->
      <div v-show="false">{{ content }}</div>
      <!--富文本编辑器-->
-      <div v-show="!preview" id="tinymce" style="height:650px;">
-        <tinymce ref="tinymce" :height="500" v-model="contentNew" style="width:800px;margin: 0 auto"/>
+      <div v-show="!preview" id="tinymce" style="height:850px;">
+        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto"/>
      </div>
      <!--网页预览-->
      <div v-show="preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
@@ -161,7 +159,8 @@ import Tinymce from '@/components/Tinymce'
 import { searchInquirySheet, searchSheetContract, doneContract } from '@/api/PurchasingCenter/CreatePurchaseContract'
 import { convertCurrency } from '@/vendor/int2Chinese'
 import { mapGetters } from 'vuex'
-
+import $ from 'jquery'
+import { sleep } from '@/utils/tool'
 export default {
  components: { Tinymce },
  inject: ['reload'],
@@ -170,7 +169,7 @@ export default {
      hasTax: '未税',
      taxRate: 0.16,
      preview: false, // 预览
-      demoRadio: '自定义', // 模板radio
+      demoRadio: '模板1', // 模板radio
      content: ``, // 合同格式模板
      contentNew: ``, // tinymce的
      contractName: '采购合同', // 合同名称
@@ -203,8 +202,6 @@ export default {
  },
  computed: {
    ...mapGetters([
-      'sidebar',
-      'avatar',
      'name',
      'id'
    ])
@@ -278,12 +275,9 @@ export default {
        case '模板2':
          this.demo2()
          break
-        case '模板3':
-          this.demo3()
-          break
-        case '自定义':
-          this.customization()
-          break
+        // case '自定义':
+        //   this.customization()
+        //   break
      }
    },
    demo1() { // 选择合同模板1
@@ -438,7 +432,10 @@ export default {
 <span>优惠后含税总价：</span><span class="actualTotal"></span><span>元</span><br><br>
 `
    },
-    editContract() { // 选择一个询价单，整成合同明细
+    async editContract() { // 选择一个询价单，整成合同明细
+      this.demoChange()
+      await sleep(0) // 处理渲染延迟
+      console.log(document.getElementById('tbody'))
      if (this.contractNumValue) {
        this.$refs.tinymce.destroyTinymce()
        document.getElementById('contractName') ? document.getElementById('contractName').innerHTML = this.contractName : ''
@@ -458,6 +455,7 @@ export default {
        // 移出旧数据
        const children = document.getElementsByClassName('tableData')
        const parent = document.getElementById('tbody')
+        console.log(children, parent)
        if (children.length !== 0) {
          for (let i = children.length - 1; i >= 0; i--) {
            parent.removeChild(children[i])
@@ -469,7 +467,8 @@ export default {
          tr[i] = document.createElement('tr')
          tr[i].setAttribute('class', 'tableData')
          tr[i].innerHTML = '<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>'
-          document.getElementById('tableHead') ? document.getElementById('tableHead').after(tr[i]) : ''
+          const tableHead = $('#tableHead')
+          tableHead ? tableHead.after(tr[i]) : ''
        }
        this.actualTotal = 0
        this.untaxTotal = 0
@@ -503,18 +502,15 @@ export default {
        this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
        this.$refs.tinymce.initTinymce()
      } else {
-        this.$message.warning('请先选择合同进行调整')
+        this.$message.warning('请先选择合同，再预览')
      }
    },
    demo2() {
      this.content = `demo2`
    },
-    demo3() {
-      this.content = `demo3`
-    },
-    customization() { // 自定义
-      this.content = `自定义`
-    },
+    // customization() { // 自定义
+    //   this.content = `自定义`
+    // },
    generateContract() { // 生成采购合同
      this.content = this.contentNew.replace(/&nbsp;/g, '')
      this.content = this.content.replace(/\n/g, '')
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -1,13 +1,12 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>发票号:</span>
-      <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
-    </el-card>
-
-    <el-card>
+      <div slot="header">
+        <span>发票号:</span>
+        <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
+      </div>
      <h4 style="margin-top: 5px">发票结算申请单</h4>
      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 300px;overflow:auto" size="mini" @row-click="searchTable2">
        <el-table-column type="expand">
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -1,20 +1,19 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>申请时间:</span>
-      <el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/>&nbsp;~
-      <el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-    </el-card>
-
-    <el-card>
+      <div slot="header">
+        <span>申请时间:</span>
+        <el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/>&nbsp;~
+        <el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      </div>
      <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
        <el-table-column type="expand">
          <template slot-scope="scope">
            <el-form label-position="left" inline class="demo-table-expand">
              <el-row>
-                <el-col :span="6">
+                <el-col :lg="6" :sm="12">
                  <viewer>
                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">
                  </viewer>
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -2,27 +2,31 @@
  <div class="app-container">
    <el-card>
      <div slot="header">
-        <span>物料名称:</span>
-        <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-        <span>物料规格:</span>
-        <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-        <span>物料型号:</span>
-        <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-        <span>物料状态:</span>
-        <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select style="margin: 0"/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left: 10px"
-          @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
-        <el-button
-          :disabled="tableData02.length===0"
-          type="primary"
-          size="small"
-          icon="el-icon-menu"
-          style="margin-left: 10px"
-          @click="bindOfflineContract">绑定离线合同</el-button>
+        <el-row style="margin-bottom: 10px">
+          <span>物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+        </el-row>
+        <el-row style="">
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+          <span>物料状态:</span>
+          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select style="margin: 0"/>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px"
+            @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询</el-button>
+          <el-button
+            :disabled="tableData02.length===0"
+            type="primary"
+            size="small"
+            icon="el-icon-menu"
+            style="margin-left: 10px"
+            @click="bindOfflineContract">绑定离线合同</el-button>
+        </el-row>
      </div>
      <el-table
        v-loading=""
@@ -118,35 +122,39 @@

    <el-card>
      <div slot="header">
-        <span>物料名称:</span>
-        <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
-        <span>物料规格:</span>
-        <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
-        <span>物料型号:</span>
-        <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
-        <span>库存状态:</span>
-        <el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable>
-          <el-option
-            v-for="item in inventoryState"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>采购状态:</span>
-        <el-select v-model="purchaseStateValue" placeholder="库存状态" size="small">
-          <el-option
-            v-for="item in purchaseState"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left: 10px"
-          @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-        <el-button style="float: right; padding: 10px" type="text" @click="showMaterialTable=!showMaterialTable">{{ showMaterialTable ? '收起' : '展开' }}</el-button>
+        <el-row style="margin-bottom: 10px">
+          <span>物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
+        </el-row>
+        <el-row style="">
+          <span>库存状态:</span>
+          <el-select v-model="inventoryStateValue" placeholder="库存状态" size="small" clearable>
+            <el-option
+              v-for="item in inventoryState"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>采购状态:</span>
+          <el-select v-model="purchaseStateValue" placeholder="库存状态" size="small">
+            <el-option
+              v-for="item in purchaseState"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left: 10px"
+            @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+          <el-button style="float: right; padding: 10px" type="text" @click="showMaterialTable=!showMaterialTable">{{ showMaterialTable ? '收起' : '展开' }}</el-button>
+        </el-row>
      </div>
      <div v-show="showMaterialTable">
        <el-table
@@ -239,15 +247,13 @@
        <el-button
          type="primary"
          size="small"
-          icon="el-icon-plus"
          style="margin-left: 10px"
          @click="addOfflineContract">创建离线合同</el-button>
        <el-button
          type="primary"
          size="small"
-          icon="el-icon-download"
          style="margin-left: 10px"
-          @click="addMateriel">选入物料</el-button>
+          @click="addMateriel">选入</el-button>
      </div>
      <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
        <el-table-column type="expand" fixed="left">
@@ -1325,10 +1331,10 @@ export default {
    width:150px;
  }
  .el-select{
-    width:200px
+    width:195px
  }
  .el-input{
-    width:200px
+    width:195px
  }
  span{
    margin: 10px 0 10px 10px;
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-card>
      <div slot="header">
-        <span>请款时间段:</span>
+        <span style="margin-left: 0">请款时间:</span>
        <el-date-picker
          v-model="dateRange"
          :picker-options="pickerOptions"
--- a/src/views/PurchasingCenter/PayStateSearch/index.vue
+++ b/src/views/PurchasingCenter/PayStateSearch/index.vue
@@ -1,28 +1,27 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>合同号:</span>
-      <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
-        <el-option
-          v-for="item in contractNum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value">
-          <div style="float: left">{{ item.label }}</div>
-          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-        </el-option>
-      </el-select>
-      <span>供应商:</span>
-      <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-    </el-card>
-
-    <el-card>
+      <div slot="header">
+        <span>合同号:</span>
+        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
+          <el-option
+            v-for="item in contractNum"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+            <div style="float: left">{{ item.label }}</div>
+            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+          </el-option>
+        </el-select>
+        <span>供应商:</span>
+        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+        <el-button
+          type="success"
+          size="small"
+          icon="el-icon-search"
+          style="margin-left:10px"
+          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      </div>
      <el-table v-loading="" :data="tableData1" stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
        <el-table-column type="expand">
          <template slot-scope="scope">
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -1,39 +1,38 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>机床图号:</span>
-      <el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-        <el-option
-          v-for="item in machine"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="groupValue" style="width:200px" 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="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-    </el-card>
-
-    <el-card>
+      <div slot="header">
+        <span>项目名称:</span>
+        <el-select v-model="projectValue" style="width:200px" placeholder="项目名称" size="small" filterable clearable @change="projectChange">
+          <el-option
+            v-for="item in project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>机床图号:</span>
+        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+          <el-option
+            v-for="item in machine"
+            :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="success"
+          size="small"
+          icon="el-icon-search"
+          style="margin-left:10px"
+          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      </div>
      <el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 600px;" height="600px" size="mini">
        <el-table-column label="序号" align="center" width="80" type="index"/>
        <el-table-column label="项目名称" align="center" min-width="100">
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -12,46 +12,51 @@
        <!--format="yyyy-MM-dd"-->
        <!--start-placeholder="开始日期"-->
        <!--end-placeholder="结束日期"/>-->
-        <span>合同号:</span>
-        <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
-          <el-option
-            v-for="item in contractNum"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            <div style="float: left">{{ item.label }}</div>
-            <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
-          </el-option>
-        </el-select>
-        <span>供应商:</span>
-        <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
-        <span>采购员:</span>
-        <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
-          <el-option
-            v-for="item in person"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>审批情况:</span>
-        <el-select v-model="approvalValue" placeholder="审批情况" size="small" style="width: 100px">
-          <el-option
-            v-for="item in approval"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left:10px"
-          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-        <el-button
-          type="warning"
-          size="small"
-          icon="el-icon-download"
-          @click="download()">导出</el-button>
+        <el-row>
+          <span>合同编号:</span>
+          <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable>
+            <el-option
+              v-for="item in contractNum"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+            </el-option>
+          </el-select>
+          <span>供应商:</span>
+          <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
+          <span>采购员:</span>
+          <el-select v-model="personValue" placeholder="采购员" size="small" clearable style="width: 100px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-row>
+
+        <el-row style="margin-top: 15px">
+          <span>审批情况:</span>
+          <el-select v-model="approvalValue" placeholder="审批情况" size="small" style="width: 100px">
+            <el-option
+              v-for="item in approval"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button
+            type="success"
+            size="small"
+            icon="el-icon-search"
+            style="margin-left:10px"
+            @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          <el-button
+            type="warning"
+            size="small"
+            icon="el-icon-download"
+            @click="download()">导出</el-button>
+        </el-row>
      </div>
      <el-table
        v-loading="loading1"
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -2,16 +2,16 @@
  <div class="app-container">
    <el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
      <el-tab-pane label="标准件和外购件">
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 5px">
          <span style="margin-left: 0">项目名称:</span>
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable style="width: 170px">
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
            <el-option
              v-for="item in project"
              :key="item.value"
              :label="item.label"
              :value="item.value"/>
          </el-select>
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
          <el-button
            type="success"
@@ -19,7 +19,7 @@
            icon="el-icon-search"
            style="margin-left: 10px"
            @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;padding-top:10px;">
            <span style="margin-left: 0">采购员:</span>
            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
              <el-option
@@ -28,6 +28,35 @@
                :label="item.label"
                :value="item.value"/>
            </el-select>
+          </div>
+        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">物料类别:</span>
+          <el-select
+            v-model="MaterialCategoryValue"
+            placeholder="请选择"
+            size="small"
+            clearable
+            @change="searchMaterialVariety">
+            <el-option
+              v-for="item in MaterialCategory"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>物料品种:</span>
+          <el-select
+            v-model="MaterialVarietyValue"
+            placeholder="请选择"
+            size="small"
+            clearable>
+            <el-option
+              v-for="item in MaterialVariety"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <div style="float:right;">
            <el-button
              type="primary"
              size="small"
@@ -42,36 +71,13 @@
              @click="executeReturn1">退回</el-button>
          </div>
        </el-row>
-        <el-row style="margin-bottom: 10px">
-          <span style="margin-left: 0">物料类别:</span>
-          <el-select
-            v-model="MaterialCategoryValue"
-            style="width:150px"
-            placeholder="请选择"
-            size="small"
-            clearable
-            @change="searchMaterialVariety">
-            <el-option
-              v-for="item in MaterialCategory"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>物料品种:</span>
-          <el-select
-            v-model="MaterialVarietyValue"
-            style="width:150px"
-            placeholder="请选择"
-            size="small"
-            clearable>
-            <el-option
-              v-for="item in MaterialVariety"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"/>
-          </el-select>
-          <span>物料名称:</span>
-          <el-input v-model="materialName" placeholder="物料名称" style="width:170px" size="small" clearable/>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">物料名称:</span>
+          <el-input v-model="materialName" placeholder="物料名称" size="small" clearable/>
+          <span>物料规格:</span>
+          <el-input v-model="materialSpec" placeholder="物料规格" size="small" clearable/>
+          <span>物料型号:</span>
+          <el-input v-model="materialModel" placeholder="物料型号" size="small" clearable/>
        </el-row>
        <el-row style="margin-bottom: 10px">
          <el-table v-loading="" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange1">
@@ -109,7 +115,7 @@
                {{ scope.row.物料品种 }}
              </template>
            </el-table-column>
-            <el-table-column align="center" label="图号" min-width="100px">
+            <el-table-column align="center" label="图号或型号" min-width="100px">
              <template slot-scope="scope">
                {{ scope.row.物料型号 }}
              </template>
@@ -169,16 +175,16 @@
        </div>
      </el-tab-pane>
      <el-tab-pane label="基本件">
-        <el-row style="margin-bottom: 10px">
+        <el-row style="margin-bottom: 5px">
          <span style="margin-left: 0">项目名称:</span>
-          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable style="width: 170px">
+          <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
            <el-option
              v-for="item in project"
              :key="item.value"
              :label="item.label"
              :value="item.value"/>
          </el-select>
-          <span>物料状态:</span>
+          <span style="margin-right: -10px">物料状态:</span>
          <el-cascader :options="materialStatus" v-model="materialStatusValue" size="small" change-on-select/>
          <el-button
            type="success"
@@ -186,7 +192,7 @@
            icon="el-icon-search"
            style="margin-left: 10px"
            @click="pageCurrent2=1;pageSize2=20;total2=0;searchTable2()">查询</el-button>
-          <div style="float:right">
+          <div style="float:right;padding-top: 10px">
            <span style="margin-left: 0">采购员:</span>
            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
              <el-option
@@ -195,6 +201,14 @@
                :label="item.label"
                :value="item.value"/>
            </el-select>
+          </div>
+        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">零件图号:</span>
+          <el-input v-model="partNum" placeholder="零件图号" size="small" clearable/>
+          <span>零件名称:</span>
+          <el-input v-model="partName" placeholder="零件名称" size="small" clearable/>
+          <div style="float:right;">
            <el-button
              type="primary"
              size="small"
@@ -209,6 +223,12 @@
              @click="executeReturn2">退回</el-button>
          </div>
        </el-row>
+        <el-row style="margin-bottom: 15px">
+          <span style="margin-left: 0">零件规格:</span>
+          <el-input v-model="partSpec" placeholder="零件规格" size="small" clearable/>
+          <span>零件材料:</span>
+          <el-input v-model="partMaterial" placeholder="零件材料" size="small" clearable/>
+        </el-row>
        <el-row style="margin-bottom: 10px">
          <el-table v-loading="" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange2">
            <el-table-column :selectable="selectable" align="center" type="selection"/>
@@ -311,6 +331,12 @@ export default {
  name: '', // 采购任务分配
  data() {
    return {
+      partNum: '',
+      partName: '',
+      partSpec: '',
+      partMaterial: '',
+      materialSpec: '',
+      materialModel: '',
      MaterialCategoryValue: '', // 物料类别
      MaterialCategory: [], // 物料类别数组
      MaterialVarietyValue: '', // 物料品种
@@ -408,16 +434,24 @@ export default {
      this.MaterialVarietyValue ? this.check2 = 1 : this.check2 = 0
      this.projectValue ? this.check3 = 1 : this.check3 = 0
      this.materialName ? this.check4 = 1 : this.check4 = 0
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
+      let check2, check3
+      this.materialSpec ? check2 = 1 : check2 = 0
+      this.materialModel ? check3 = 1 : check3 = 0
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.MaterialCategoryValue, this.check2, this.MaterialVarietyValue, this.check3, this.projectValue, this.check4, this.materialName, this.materialStatusValue[this.materialStatusValue.length - 1], check2, this.materialSpec, check3, this.materialModel).then(response => {
        this.tableData1 = response.data.rows
-        console.log(response.data.rows)
        this.total1 = response.data.total
      })
    },
    searchTable2() { // 查询基本件
      this.projectValue ? this.check3 = 1 : this.check3 = 0
-      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.materialStatusValue[this.materialStatusValue.length - 1]).then(response => {
+      let check1, check2, check3, check4
+      this.partNum ? check1 = 1 : check1 = 0
+      this.partName ? check2 = 1 : check2 = 0
+      this.partSpec ? check3 = 1 : check3 = 0
+      this.partMaterial ? check4 = 1 : check4 = 0
+      searchTable2(this.pageCurrent2, this.pageSize2, this.check3, this.projectValue, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, check4, this.partMaterial).then(response => {
        this.tableData2 = response.data.rows
+        console.log(response.data.rows)
        this.total2 = response.data.total
      })
    },
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -1,34 +1,33 @@
 <template>
-  <div class="app-container">
+  <div class="app-container receiveCheck">
    <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
-        <el-option
-          v-for="item in project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>机床图号:</span>
-      <el-select v-model="machineValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
-        <el-option
-          v-for="item in machine"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="groupValue" style="width:200px" 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="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchProject()">查询</el-button>
-    </el-card>
-
-    <el-card style="margin-top: 15px">
+      <div slot="header">
+        <span>项目名称:</span>
+        <el-select v-model="projectValue" style="width:200px" placeholder="请选择" size="small" clearable filterable @change="projectChange">
+          <el-option
+            v-for="item in project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>机床图号:</span>
+        <el-select v-model="machineValue" style="width:190px" placeholder="请选择" size="small" clearable filterable @change="machineChange">
+          <el-option
+            v-for="item in machine"
+            :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="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchProject()">查询</el-button>
+      </div>
      <el-table
        :data="tableData1"
        :summary-method="getSummaries"