From 14b7f653cb9bc4bb026cedfa7ec9bd45e7a842ab Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 17 Feb 2020 10:55:45 +0800
Subject: [PATCH] sidebar

---
 src/styles/sidebar.scss                       |   1 +
 .../MaterialArrival/index.vue                 | 226 ++--
 .../NewArrivalList/index.vue                  | 978 +++++++++---------
 .../OutsourcingMaterialsSearch/index.vue      |  15 +-
 .../RequestOutsourcingMaterials/index.vue     | 340 +++---
 src/views/layout/components/AppMain.vue       |   2 +-
 6 files changed, 786 insertions(+), 776 deletions(-)

diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index fab46e1b..c394b99e 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -1,6 +1,7 @@
 #app {
   // 主体区域
   .main-container {
+    min-width: 1380px;
     min-height: 100%;
     transition: margin-left .28s;
     margin-left: 200px;
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index e28940e3..9d8bd9b5 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -1,116 +1,120 @@
 <template>
   <div class="app-container">
-    <el-card>
-      <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
-        <el-option
-          v-for="item in Machines"
-          :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.value2 }}</div>
-        </el-option>
-      </el-select>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
-        <el-option
-          v-for="item in Groups"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
-      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-      <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
-    </el-card>
-    <el-row>
-      <el-card style="width: 50%; float: left">
-        <el-table
-          :data="tableData"
-          loading="loading"
-          class="table"
-          highlight-current-row
-          border
-          stripe
-          height="750"
-          style="width: 100%"
-          @current-change="getCurrentRow">
-          <el-table-column align="center" type="index" label="序号" width="50"/>
-          <el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
-            <template slot-scope="scope">
-              {{ scope.row.机床图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="组号" show-overflow-tooltip width="120">
-            <template slot-scope="scope">
-              {{ scope.row.组号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
-            <template slot-scope="scope">
-              {{ scope.row.零件图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
-            <template slot-scope="scope">
-              {{ scope.row.零件名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="数量" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.投产数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="加工完成" width="110">
-            <template slot-scope="scope">
-              {{ scope.row.完成日期 }}
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="block">
-          <el-pagination
-            :current-page="pageCurrent"
-            :page-sizes="[50, 200, 300, 400]"
-            :page-size="pageSize"
-            :total="total"
-            layout="total, sizes, prev, pager, next, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"/>
-        </div>
-      </el-card>
-      <el-card style="width: 34.5%; float: left">
-        <el-table
-          :data="tableData1"
-          loading="loading"
-          class="table"
-          style="max-height: 830px"
-          highlight-current-row
-          empty-text="   "
-          border
-          @row-click="getRow">
-          <el-table-column type="index" label="序号" width="50"/>
-          <el-table-column align="center" label="工艺名" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.工艺名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
-            <template slot-scope="scope">
-              {{ scope.row.操作者 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="排产日期" min-width="110">
-            <template slot-scope="scope">
-              {{ scope.row.排产日期 }}
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="完成日期" min-width="110">
-            <template slot-scope="scope">
-              {{ scope.row.完成日期 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-card>
-    </el-row>
+    <div style="width: 100%;overflow:auto">
+      <div style="white-space: nowrap">
+        <el-card style="width: 1455px">
+          <el-select v-model="Machine" filterable clearable size="small" style="margin:0px 10px 0px 10px;width: 180px;" placeholder="机床号" @change="getGroup">
+            <el-option
+              v-for="item in Machines"
+              :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.value2 }}</div>
+            </el-option>
+          </el-select>
+          <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin:0px 10px;width: 120px;" @change="getTableData">
+            <el-option
+              v-for="item in Groups"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
+          <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+          <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+        </el-card>
+        <el-row>
+          <el-card style="width: 850px; margin-left: 0px;display: inline-block;" >
+            <el-table
+              :data="tableData"
+              loading="loading"
+              class="table"
+              highlight-current-row
+              border
+              stripe
+              height="750"
+              style="width: 100%"
+              @current-change="getCurrentRow">
+              <el-table-column align="center" type="index" label="序号" width="50"/>
+              <el-table-column align="center" label="机床号" show-overflow-tooltip width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.机床图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="组号" show-overflow-tooltip width="120">
+                <template slot-scope="scope">
+                  {{ scope.row.组号 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="零件图号" show-overflow-tooltip min-width="190">
+                <template slot-scope="scope">
+                  {{ scope.row.零件图号 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="零件名称" show-overflow-tooltip width="140">
+                <template slot-scope="scope">
+                  {{ scope.row.零件名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="数量" width="80">
+                <template slot-scope="scope">
+                  {{ scope.row.投产数量 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="加工完成" width="110">
+                <template slot-scope="scope">
+                  {{ scope.row.完成日期 }}
+                </template>
+              </el-table-column>
+            </el-table>
+            <div class="block">
+              <el-pagination
+                :current-page="pageCurrent"
+                :page-sizes="[50, 200, 300, 400]"
+                :page-size="pageSize"
+                :total="total"
+                layout="total, sizes, prev, pager, next, jumper"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"/>
+            </div>
+          </el-card>
+          <el-card style="width: 600px; margin-left: 1px;display: inline-block;vertical-align: top;">
+            <el-table
+              :data="tableData1"
+              loading="loading"
+              class="table"
+              style="max-height: 830px"
+              highlight-current-row
+              empty-text="   "
+              border
+              @row-click="getRow">
+              <el-table-column type="index" label="序号" width="50"/>
+              <el-table-column align="center" label="工艺名" min-width="100">
+                <template slot-scope="scope">
+                  {{ scope.row.工艺名称 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作者" show-overflow-tooltip min-width="90">
+                <template slot-scope="scope">
+                  {{ scope.row.操作者 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="排产日期" min-width="110">
+                <template slot-scope="scope">
+                  {{ scope.row.排产日期 }}
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="完成日期" min-width="110">
+                <template slot-scope="scope">
+                  {{ scope.row.完成日期 }}
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-card>
+        </el-row>
+      </div>
+    </div>
   </div>
 </template>
 
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 2586bffe..9c03e274 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -1,501 +1,505 @@
 <template>
-  <div>
-    <el-card>
-      <div>
-        <span style="margin-left: 10px">供应商:</span>
-        <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">
-          <el-option
-            v-for="item in supplierName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <span>请款时间段:</span>
-        <el-date-picker
-          v-model="dateRange"
-          :picker-options="pickerOptions"
-          size="small"
-          type="daterange"
-          align="center"
-          style="width: 240px;margin: 3px 0"
-          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="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
-        <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
-      </div>
-    </el-card>
-    <el-card style="width: 45%;float: left">
-      <span>到货单</span>
-      <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5">
-        <el-table-column label="关联情况" align="center" width="80">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
-            <span v-else type="primary" size="mini">未结算</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" prop="供应商名称" align="center" width="245" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="到货日期" prop="到货日期" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.日期.split(' ')[0] }}
-          </template>
-        </el-table-column>
-        <el-table-column label="到货单号" align="center" width="110">
-          <template slot-scope="scope">
-            {{ scope.row.到货单编号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="110">
-          <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: -5px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
-            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 5px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
-          </template>
-        </el-table-column>
-      <!--</el-tooltip>-->
-      <!--<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">-->
-        <!--<div style="display: inline-block">-->
-        <!--<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalOrder(scope.row)"/>-->
-        <!--</div>-->
-      <!--</el-tooltip>-->
-      <!--<el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">-->
-        <!--<div style="display: inline-block">-->
-        <!--<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>-->
-        <!--</div>-->
-      <!--</el-tooltip>-->
-        <!--</template>-->
-      <!--</el-table-column>-->
-      </el-table>
-      <div class="block">
-        <el-pagination
-          :current-page="pageCurrent4"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize4"
-          :total="total4"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange4"
-          @current-change="handleCurrentChange4"/>
-      </div>
-    </el-card>
-    <el-card style="width: 54%;float: left;margin-left: 10px">
-      <span>到货单明细</span>
-      <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
-      <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
-      <el-table
-        v-loading=""
-        :data="tableData5"
-        :summary-method="getSummaries"
-        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
-        border
-        show-summary
-        highlight-current-row
-        style="margin: 3px 0; width: 900px"
-        height="260px"
-        size="mini"
-        @row-click="searchTable6">
-        <el-table-column width="50" align="center" type="index" label="序号"/>
-        <el-table-column label="材料" prop="材料" align="center" width="140">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" prop="数量" width="70">
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center" width="70" >
-          <template slot-scope="scope">
-            {{ scope.row.单位 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单价" align="right" width="130">
-          <template slot-scope="scope">
-            {{ scope.row.单价.toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="金额" align="right" width="130">
-          <template slot-scope="scope">
-            {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="140">
-          <template slot-scope="scope">
-            <el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="disable === '1'" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
-              </div>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalMX(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-card style="width: 100%">
-      <span>关联备料材料</span>
-      <el-table
-        v-loading=""
-        :data="tableData6"
-        :summary-method="getSummaries1"
-        border
-        show-summary
-        highlight-current-row
-        style="margin: 3px 0; width: 1280px"
-        height="500px"
-        size="mini">
-        <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.物料零件编码 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" prop="零件名称" align="center" width="140" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" prop="材料" align="center" width="140" >
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="成品尺寸（长、宽、高）" align="center" width="240">
-          <template slot-scope="scope">
-            {{ scope.row.成品尺寸 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总重量" align="center" prop="总重量" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.重量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center" width="70" >
-          <template slot-scope="scope">
-            {{ scope.row.单位 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总金额" align="center" prop="总金额" width="130">
-          <template slot-scope="scope">
-            {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="90px">
-          <template slot-scope="scope">
-            <el-tooltip effect="dark" content="取消关联" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="disable === '1'" type="text" icon="el-icon-delete" size="mini" @click="deleteMateriel(scope.row)"/>
-              </div>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-
-    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
-        <el-row>
-          <el-form-item label="供应商" prop="supplierNameValue">
-            <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" size="small" filterable @change="searchTable20()">
+  <div class="app-container">
+    <div style="width: 100%;overflow:auto">
+      <div style="white-space: nowrap">
+        <el-card style="width: 1329px;">
+          <div>
+            <span style="margin-left: 10px">供应商:</span>
+            <el-select v-model="supplierNameValue" placeholder="供应商" size="small" style="width: 220px" filterable clearable @change="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">
               <el-option
-                v-for="item in supplierNames"
+                v-for="item in supplierName"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-          </el-form-item>
-        </el-row>
-        <el-row>
-          <el-form-item label="到货日期" prop="invoiceTime">
-            <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          v-show="title==='新增到货单'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitAddArrivalOrder">保存</el-button>
-        <el-button
-          v-show="title==='编辑到货单'"
-          type="primary"
-          size="small"
-          icon="el-icon-check"
-          @click="submitEditArrivalOrder">确定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
-      <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
-        <el-row style="background-color: white">
-          <el-col :span="5" style="margin-left: 2%">
-            <span>供应商</span>
-            <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
-          </el-col>
-          <el-col :span="4">
-            <span>到货单编号</span>
-            <el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
-          </el-col>
-          <el-col :span="4">
-            <span>计划类型</span>
-            <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
-              <el-option
-                v-for="item in planTypes"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-          </el-col>
-          <el-col :span="4">
-            <span>零件图号</span>
-            <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
-          </el-col>
-          <el-col :span="2">
-            <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
-          </el-col>
-        </el-row>
-        <el-row>
-          <div style="width: 20%;float: left;margin-top: 20px">
-            <div style="background: white">
-              <el-row style="height: 50px">
-                <el-form-item label="材料" prop="CailiaoValue">
-                  <el-input v-model="form10.CailiaoValue" size="small"/>
-                </el-form-item>
-              </el-row>
-              <el-row style="height: 50px">
-                <el-form-item label="数量" prop="数量">
-                  <el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
-                </el-form-item>
-              </el-row>
-              <el-row style="height: 50px">
-                <el-form-item label="单价" prop="单价">
-                  <el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
-                </el-form-item>
-              </el-row>
-              <el-row style="height: 50px">
-                <el-form-item label="单位" prop="单位">
-                  <el-input v-model="form10.单位" size="small"/>
-                </el-form-item>
-              </el-row>
-              <el-row style="height: 50px">
-                <el-form-item label="金额" prop="金额">
-                  <el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium"/>
-                </el-form-item>
-              </el-row>
-            </div>
-            <div>
-              <el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
-            </div>
+            <span>请款时间段:</span>
+            <el-date-picker
+              v-model="dateRange"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              align="center"
+              style="width: 240px;margin: 3px 0"
+              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="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+            <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
           </div>
-          <div style="width: 79%;float: left;margin-left: 10px">
-            <el-table :row-key="getRowKeys" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="550px" size="mini" @selection-change="handleSelectionChange">
-              <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
-              <el-table-column label="采购单号" align="center" width="120">
-                <template slot-scope="scope">
-                  {{ scope.row.采购单号 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="物料编码" align="center" width="150">
-                <template slot-scope="scope">
-                  {{ scope.row.物料零件编码 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="零件名称" align="center" width="90px">
-                <template slot-scope="scope">
-                  {{ scope.row.零件名称 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="材料" align="center" width="70px">
-                <template slot-scope="scope">
-                  {{ scope.row.材料 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="备料件数" align="center" width="70px">
-                <template slot-scope="scope">
-                  {{ scope.row.采购数量 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="已到件数" align="center" width="70px">
-                <template slot-scope="scope">
-                  {{ scope.row.到货数量 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="到货件数" align="center" width="110px">
-                <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
-                <template slot-scope="scope">
-                  <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="成品尺寸（长、宽、高）" align="center">
-                <template slot-scope="scope">
-                  {{ scope.row.成品尺寸 }}
-                </template>
-              </el-table-column>
-              <el-table-column label="单位" align="center" width="60px">
-                <template slot-scope="scope">
-                  {{ scope.row.单位 ? scope.row.单位 : '-' }}
-                </template>
-              </el-table-column>
-              <el-table-column label="备注" align="center">
-                <template slot-scope="scope">
-                  {{ scope.row.备注1 }}
-                </template>
-              </el-table-column>
-            </el-table>
+        </el-card>
+        <el-card style="width: 660px;margin-left: 0px;display: inline-block">
+          <span>到货单</span>
+          <el-table v-loading="" :data="tableData4" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" border stripe style="width: 7000px" height="240px" size="mini" highlight-current-row @row-click="searchTable5">
+            <el-table-column label="关联情况" align="center" width="80">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
+                <span v-else type="primary" size="mini">未结算</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="供应商" prop="供应商名称" align="center" width="220" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="到货日期" prop="到货日期" align="center" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.日期.split(' ')[0] }}
+              </template>
+            </el-table-column>
+            <el-table-column label="到货单号" align="center" width="110">
+              <template slot-scope="scope">
+                {{ scope.row.到货单编号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="110">
+              <template slot-scope="scope">
+                <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: -5px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
+                <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 5px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
+              </template>
+            </el-table-column>
+            <!--</el-tooltip>-->
+            <!--<el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-edit-outline" @click="editArrivalOrder(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--<el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">-->
+            <!--<div style="display: inline-block">-->
+            <!--<el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>-->
+            <!--</div>-->
+            <!--</el-tooltip>-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+          </el-table>
+          <div class="block">
+            <el-pagination
+              :current-page="pageCurrent4"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="pageSize4"
+              :total="total4"
+              style="display:inline-block;width:50%"
+              layout="total, sizes, prev, pager, next, jumper"
+              @size-change="handleSizeChange4"
+              @current-change="handleCurrentChange4"/>
           </div>
-        </el-row>
-      </el-form>
-    </el-dialog>
+        </el-card>
+        <el-card style="width: 660px;margin-left: 3px;display: inline-block;vertical-align: top">
+          <span>到货单明细</span>
+          <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
+          <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
+          <el-table
+            v-loading=""
+            :data="tableData5"
+            :summary-method="getSummaries"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+            border
+            show-summary
+            highlight-current-row
+            style="margin: 3px 0; width: 650px"
+            height="260px"
+            size="mini"
+            @row-click="searchTable6">
+            <el-table-column width="50" align="center" type="index" label="序号"/>
+            <el-table-column label="材料" prop="材料" align="center" width="140">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" prop="数量" width="70">
+              <template slot-scope="scope">
+                {{ scope.row.数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" align="center" width="70" >
+              <template slot-scope="scope">
+                {{ scope.row.单位 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单价" align="right" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.单价.toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="金额" align="right" width="80">
+              <template slot-scope="scope">
+                {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="140">
+              <template slot-scope="scope">
+                <el-tooltip :open-delay="1200" effect="dark" content="关联备料材料" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="disable === '1'" type="text" size="mini" icon="el-icon-circle-plus-outline" @click="addArrivalCL(scope.row)">备料材料</el-button>
+                  </div>
+                </el-tooltip>
+                <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="disable === '1'" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalMX(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-card style="width: 1329px">
+          <span>关联备料材料</span>
+          <el-table
+            v-loading=""
+            :data="tableData6"
+            :summary-method="getSummaries1"
+            border
+            show-summary
+            highlight-current-row
+            style="margin: 3px 0; width: 1280px"
+            height="500px"
+            size="mini">
+            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.物料零件编码 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件名称" prop="零件名称" align="center" width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="材料" prop="材料" align="center" width="140" >
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="数量" align="center" width="100px">
+              <template slot-scope="scope">
+                {{ scope.row.数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="成品尺寸（长、宽、高）" align="center" width="240">
+              <template slot-scope="scope">
+                {{ scope.row.成品尺寸 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="总重量" align="center" prop="总重量" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.重量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" align="center" width="70" >
+              <template slot-scope="scope">
+                {{ scope.row.单位 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="总金额" align="center" prop="总金额" width="130">
+              <template slot-scope="scope">
+                {{ (parseInt(scope.row.金额 * 100) / 100).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.备注 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="90px">
+              <template slot-scope="scope">
+                <el-tooltip effect="dark" content="取消关联" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="disable === '1'" type="text" icon="el-icon-delete" size="mini" @click="deleteMateriel(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
 
-    <!--<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 200px" width="430px">-->
-    <!--<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="120px">-->
-    <!--<el-row>-->
-    <!--<el-form-item v-show="title1==='添加到货明细'" label="材料" prop="CailiaoValue">-->
-    <!--<el-input v-model="form1.CailiaoValue" size="small"/>-->
-    <!--</el-form-item>-->
-    <!--</el-row>-->
-    <!--<el-row>-->
-    <!--<el-form-item label="数量" prop="数量">-->
-    <!--<el-input-number v-model="form1.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
-    <!--</el-form-item>-->
-    <!--</el-row>-->
-    <!--<el-row>-->
-    <!--<el-form-item label="单价" prop="单价">-->
-    <!--<el-input-number v-model="form1.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
-    <!--</el-form-item>-->
-    <!--</el-row>-->
-    <!--<el-row>-->
-    <!--<el-form-item label="单位" prop="单位">-->
-    <!--<el-input v-model="form1.单位" size="small"/>-->
-    <!--</el-form-item>-->
-    <!--</el-row>-->
-    <!--<el-row>-->
-    <!--<el-form-item label="金额" prop="金额">-->
-    <!--<el-input-number v-model="form1.金额" :precision="2" :step="1" size="medium"/>-->
-    <!--</el-form-item>-->
-    <!--</el-row>-->
-    <!--</el-form>-->
-    <!--<div slot="footer" class="dialog-footer">-->
-    <!--<el-button-->
-    <!--v-show="title1==='添加到货明细'"-->
-    <!--type="warning"-->
-    <!--size="small"-->
-    <!--plain-->
-    <!--icon="el-icon-check"-->
-    <!--@click="submitAddArrivalOrderMX">保存</el-button>-->
-    <!--<el-button-->
-    <!--v-show="title1==='添加到货明细'"-->
-    <!--type="primary"-->
-    <!--plain-->
-    <!--size="small"-->
-    <!--icon="el-icon-check"-->
-    <!--@click="submitAddArrivalOrderMX1">继续添加</el-button>-->
-    <!--<el-button-->
-    <!--v-show="title1==='编辑到货明细'"-->
-    <!--type="primary"-->
-    <!--size="small"-->
-    <!--icon="el-icon-check"-->
-    <!--@click="submitEditArrivalOrderMX">确定</el-button>-->
-    <!--</div>-->
-    <!--</el-dialog>-->
+        <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" center style="min-height: 400px" width="380px">
+          <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
+            <el-row>
+              <el-form-item label="供应商" prop="supplierNameValue">
+                <el-select v-show="title==='新增到货单'" v-model="form.supplierNameValue" placeholder="供应商" size="small" filterable @change="searchTable20()">
+                  <el-option
+                    v-for="item in supplierNames"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"/>
+                </el-select>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="到货日期" prop="invoiceTime">
+                <el-date-picker v-model="form.日期" size="small" type="date" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="选择日期"/>
+              </el-form-item>
+            </el-row>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button
+              v-show="title==='新增到货单'"
+              type="primary"
+              size="small"
+              icon="el-icon-check"
+              @click="submitAddArrivalOrder">保存</el-button>
+            <el-button
+              v-show="title==='编辑到货单'"
+              type="primary"
+              size="small"
+              icon="el-icon-check"
+              @click="submitEditArrivalOrder">确定</el-button>
+          </div>
+        </el-dialog>
+        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
+          <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
+            <el-row style="background-color: white">
+              <el-col :span="5" style="margin-left: 2%">
+                <span>供应商</span>
+                <el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
+              </el-col>
+              <el-col :span="4">
+                <span>到货单编号</span>
+                <el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
+              </el-col>
+              <el-col :span="4">
+                <span>计划类型</span>
+                <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
+                  <el-option
+                    v-for="item in planTypes"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"/>
+                </el-select>
+              </el-col>
+              <el-col :span="4">
+                <span>零件图号</span>
+                <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
+              </el-col>
+              <el-col :span="2">
+                <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
+              </el-col>
+            </el-row>
+            <el-row>
+              <div style="width: 20%;float: left;margin-top: 20px">
+                <div style="background: white">
+                  <el-row style="height: 50px">
+                    <el-form-item label="材料" prop="CailiaoValue">
+                      <el-input v-model="form10.CailiaoValue" size="small"/>
+                    </el-form-item>
+                  </el-row>
+                  <el-row style="height: 50px">
+                    <el-form-item label="数量" prop="数量">
+                      <el-input-number v-model="form10.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
+                    </el-form-item>
+                  </el-row>
+                  <el-row style="height: 50px">
+                    <el-form-item label="单价" prop="单价">
+                      <el-input-number v-model="form10.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>
+                    </el-form-item>
+                  </el-row>
+                  <el-row style="height: 50px">
+                    <el-form-item label="单位" prop="单位">
+                      <el-input v-model="form10.单位" size="small"/>
+                    </el-form-item>
+                  </el-row>
+                  <el-row style="height: 50px">
+                    <el-form-item label="金额" prop="金额">
+                      <el-input-number v-model="form10.金额" :precision="2" :step="1" size="medium"/>
+                    </el-form-item>
+                  </el-row>
+                </div>
+                <div>
+                  <el-button type="primary" size="small" style="margin-left: 40%;margin-top: 10px" @click="submitAddArrivalOrderMX">确定</el-button>
+                </div>
+              </div>
+              <div style="width: 79%;float: left;margin-left: 10px">
+                <el-table :row-key="getRowKeys" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="550px" size="mini" @selection-change="handleSelectionChange">
+                  <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
+                  <el-table-column label="采购单号" align="center" width="120">
+                    <template slot-scope="scope">
+                      {{ scope.row.采购单号 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="物料编码" align="center" width="150">
+                    <template slot-scope="scope">
+                      {{ scope.row.物料零件编码 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="零件名称" align="center" width="90px">
+                    <template slot-scope="scope">
+                      {{ scope.row.零件名称 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="材料" align="center" width="70px">
+                    <template slot-scope="scope">
+                      {{ scope.row.材料 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备料件数" align="center" width="70px">
+                    <template slot-scope="scope">
+                      {{ scope.row.采购数量 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="已到件数" align="center" width="70px">
+                    <template slot-scope="scope">
+                      {{ scope.row.到货数量 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="到货件数" align="center" width="110px">
+                    <template slot-scope="scope">
+                      <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
+                    <template slot-scope="scope">
+                      <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="成品尺寸（长、宽、高）" align="center">
+                    <template slot-scope="scope">
+                      {{ scope.row.成品尺寸 }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="单位" align="center" width="60px">
+                    <template slot-scope="scope">
+                      {{ scope.row.单位 ? scope.row.单位 : '-' }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="备注" align="center">
+                    <template slot-scope="scope">
+                      {{ scope.row.备注1 }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-row>
+          </el-form>
+        </el-dialog>
 
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
-      <span>计划类型</span>
-      <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
-        <el-option
-          v-for="item in planTypes"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>零件图号</span>
-      <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
-      <el-table :row-key="getRowKeys" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
-        <el-table-column label="采购单号" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.采购单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料编码" align="center" width="150">
-          <template slot-scope="scope">
-            {{ scope.row.物料零件编码 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" width="90px">
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="材料" align="center" width="70px">
-          <template slot-scope="scope">
-            {{ scope.row.材料 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备料件数" align="center" width="70px">
-          <template slot-scope="scope">
-            {{ scope.row.采购数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="已到件数" align="center" width="70px">
-          <template slot-scope="scope">
-            {{ scope.row.到货数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="到货件数" align="center" width="110px">
-          <template slot-scope="scope">
-            <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="到货重量" align="center" width="110px">
-          <template slot-scope="scope">
-            <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="成品尺寸（长、宽、高）" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.成品尺寸 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="单位" align="center" width="60px">
-          <template slot-scope="scope">
-            {{ scope.row.单位 ? scope.row.单位 : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.备注1 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入备料材料</el-button>
+        <!--<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 200px" width="430px">-->
+        <!--<el-form ref="form1" :model="form1" :rules="rules1" label-position="right" label-width="120px">-->
+        <!--<el-row>-->
+        <!--<el-form-item v-show="title1==='添加到货明细'" label="材料" prop="CailiaoValue">-->
+        <!--<el-input v-model="form1.CailiaoValue" size="small"/>-->
+        <!--</el-form-item>-->
+        <!--</el-row>-->
+        <!--<el-row>-->
+        <!--<el-form-item label="数量" prop="数量">-->
+        <!--<el-input-number v-model="form1.数量" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
+        <!--</el-form-item>-->
+        <!--</el-row>-->
+        <!--<el-row>-->
+        <!--<el-form-item label="单价" prop="单价">-->
+        <!--<el-input-number v-model="form1.单价" :precision="2" :step="1" :min="0" size="medium" @change="Calculation"/>-->
+        <!--</el-form-item>-->
+        <!--</el-row>-->
+        <!--<el-row>-->
+        <!--<el-form-item label="单位" prop="单位">-->
+        <!--<el-input v-model="form1.单位" size="small"/>-->
+        <!--</el-form-item>-->
+        <!--</el-row>-->
+        <!--<el-row>-->
+        <!--<el-form-item label="金额" prop="金额">-->
+        <!--<el-input-number v-model="form1.金额" :precision="2" :step="1" size="medium"/>-->
+        <!--</el-form-item>-->
+        <!--</el-row>-->
+        <!--</el-form>-->
+        <!--<div slot="footer" class="dialog-footer">-->
+        <!--<el-button-->
+        <!--v-show="title1==='添加到货明细'"-->
+        <!--type="warning"-->
+        <!--size="small"-->
+        <!--plain-->
+        <!--icon="el-icon-check"-->
+        <!--@click="submitAddArrivalOrderMX">保存</el-button>-->
+        <!--<el-button-->
+        <!--v-show="title1==='添加到货明细'"-->
+        <!--type="primary"-->
+        <!--plain-->
+        <!--size="small"-->
+        <!--icon="el-icon-check"-->
+        <!--@click="submitAddArrivalOrderMX1">继续添加</el-button>-->
+        <!--<el-button-->
+        <!--v-show="title1==='编辑到货明细'"-->
+        <!--type="primary"-->
+        <!--size="small"-->
+        <!--icon="el-icon-check"-->
+        <!--@click="submitEditArrivalOrderMX">确定</el-button>-->
+        <!--</div>-->
+        <!--</el-dialog>-->
+
+        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
+          <span>计划类型</span>
+          <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
+            <el-option
+              v-for="item in planTypes"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <span>零件图号</span>
+          <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
+          <el-table :row-key="getRowKeys" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
+            <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
+            <el-table-column label="采购单号" align="center" width="120">
+              <template slot-scope="scope">
+                {{ scope.row.采购单号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" align="center" width="150">
+              <template slot-scope="scope">
+                {{ scope.row.物料零件编码 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="零件名称" align="center" width="90px">
+              <template slot-scope="scope">
+                {{ scope.row.零件名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="材料" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.材料 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备料件数" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.采购数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="已到件数" align="center" width="70px">
+              <template slot-scope="scope">
+                {{ scope.row.到货数量 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="到货件数" align="center" width="110px">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.采购数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="到货重量" align="center" width="110px">
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="成品尺寸（长、宽、高）" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.成品尺寸 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="单位" align="center" width="60px">
+              <template slot-scope="scope">
+                {{ scope.row.单位 ? scope.row.单位 : '-' }}
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.备注1 }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入备料材料</el-button>
+          </div>
+        </el-dialog>
       </div>
-    </el-dialog>
+    </div>
   </div>
 </template>
 <script>
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index a34a21bd..28e87173 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -1,19 +1,16 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 76%">
+    <el-card style="width: 100%">
       <div style="margin-top: 7px; margin-bottom: 7px">
-        <span>供应商</span>
-        <el-select v-model="supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable clearable>
+        <el-select v-model="supplierNameValue" style="width:220px" placeholder="供应商" size="small" filterable clearable>
           <el-option
             v-for="item in supplierNames"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>零件图号</span>
-        <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 160px" clearable/>
-        <span>备料状态</span>
-        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 100px" clearable>
+        <el-input v-model="partNumber" size="small" placeholder="零件图号" style="width: 180px" clearable/>
+        <el-select v-model="MaterialsValue" placeholder="请选择备料状态" filterable size="small" style="width: 140px" clearable>
           <el-option
             v-for="item in Materials"
             :key="item.value"
@@ -27,7 +24,7 @@
           size="small"
           type="daterange"
           align="center"
-          style="width: 300px;margin: 3px 0"
+          style="width: 240px;margin: 3px 0"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           range-separator="～"
@@ -37,7 +34,7 @@
         <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
-    <el-card style="width: 76%">
+    <el-card style="width: 100%">
       <el-table
         v-loading="loading"
         :data="tableData"
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 5775e208..09deef39 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -1,175 +1,179 @@
 <template>
   <div class="app-container">
-    <el-card style="">
-      <el-col>
-        <span>请款时间段:</span>
-        <el-date-picker
-          v-model="dateRange"
-          :picker-options="pickerOptions"
-          size="small"
-          type="daterange"
-          align="center"
-          style="width: 240px;margin: 3px 0"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
-          range-separator="～"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"/>
-        <span style="margin-left: 10px">供应商:</span>
-        <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
-        <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
-          <el-button
-            type="primary"
-            size="small"
-            plain
-            icon="el-icon-search"
-            style="margin-left: 10px"
-            @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-        </el-tooltip>
-        <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-          <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
-        </el-tooltip>
-        <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
-        </el-tooltip>
-      </el-col>
-    </el-card>
-    <el-card style="margin-left: 0px;width: 67%;float: left" >
-      <el-table
-        v-loading=""
-        :data="tableData1"
-        :row-key="getRowKeys"
-        :expand-row-keys="expands"
-        :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
-        border
-        stripe
-        style="margin-top: 3px;"
-        height="600px"
-        size="mini"
-        show-summary
-        highlight-current-row
-        @row-click="searchTable02">
-        <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 | formatTime }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="80" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.姓名 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
-          <template slot-scope="scope">
-            {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批进程" width="80" align="center">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
-            <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
-            <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="未通过审批原因" width="120" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="付款情况" width="100" align="center">
-          <template slot-scope="scope">
-            <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
-            <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
-            <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="未付款原因" width="100" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="80">
-          <template slot-scope="scope">
-            <el-tooltip effect="dark" content="取消请款" placement="top">
-              <div style="display: inline-block">
-                <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
-              </div>
+    <div style="width: 100%;overflow:auto">
+      <div style="white-space: nowrap">
+        <el-card style="width: 1663px">
+          <el-col>
+            <span>请款时间段:</span>
+            <el-date-picker
+              v-model="dateRange"
+              :picker-options="pickerOptions"
+              size="small"
+              type="daterange"
+              align="center"
+              style="width: 240px;margin: 3px 0"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              range-separator="～"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"/>
+            <span style="margin-left: 10px">供应商:</span>
+            <el-input v-model="supplierName0" placeholder="供应商" style="width: 220px" size="small" clearable/>
+            <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
+              <el-button
+                type="primary"
+                size="small"
+                plain
+                icon="el-icon-search"
+                style="margin-left: 10px"
+                @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
             </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize1"
-          :total="total1"
-          style="display:inline-block;width:50%"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
+            <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
+              <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
+              <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 130px" @click="exportExcel">导出</el-button>
+            </el-tooltip>
+          </el-col>
+        </el-card>
+        <el-card style="margin-left: 0px;width: 1135px;margin-left: 0px;display: inline-block" >
+          <el-table
+            v-loading=""
+            :data="tableData1"
+            :row-key="getRowKeys"
+            :expand-row-keys="expands"
+            :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}"
+            border
+            stripe
+            style="margin-top: 3px;"
+            height="600px"
+            size="mini"
+            show-summary
+            highlight-current-row
+            @row-click="searchTable02">
+            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="180" width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款时间" align="center" min-width="90" width="90" prop="date">
+              <template slot-scope="scope">
+                {{ scope.row.请款时间 | formatTime }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款人" align="center" min-width="80" width="100">
+              <template slot-scope="scope">
+                {{ scope.row.姓名 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="请款金额" align="center" min-width="90" width="90" prop="请款金额">
+              <template slot-scope="scope">
+                {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="审批进程" width="80" align="center">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
+                <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
+                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未通过审批原因" width="120" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="付款情况" width="100" align="center">
+              <template slot-scope="scope">
+                <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
+                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
+                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未付款原因" width="100" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="80">
+              <template slot-scope="scope">
+                <el-tooltip effect="dark" content="取消请款" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
+                  </div>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block" style="margin-top: 10px;">
+            <el-pagination
+              :current-page="pageCurrent1"
+              :page-sizes="[10, 20, 30, 40]"
+              :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-card style="margin-left: 0px;width:524px; margin-left: 1px; display: inline-block;vertical-align: top">
+          <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
+            <el-table-column width="50" align="center" type="index" label="序号"/>
+            <el-table-column min-width="120" align="center" label="发票号">
+              <template slot-scope="scope">
+                {{ scope.row.发票号 }}
+              </template>
+            </el-table-column>
+            <el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
+              <template slot-scope="scope">
+                {{ scope.row.开票金额.toFixed(2) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+        <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
+          <span>供应商：</span>
+          <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
+            <el-option
+              v-for="item in supplier"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50"/>
+            <el-table-column label="发票号" align="center" min-width="120">
+              <template slot-scope="scope">
+                {{ scope.row.发票号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ scope.row.供应商名称 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center" min-width="70">
+              <template slot-scope="scope">
+                {{ scope.row.开票金额 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="开票时间" align="center" min-width="70">
+              <template slot-scope="scope">
+                {{ scope.row.开票时间 | formatTime }}
+              </template>
+            </el-table-column>
+          </el-table>
+          <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+          <el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
+        </el-dialog>
       </div>
-    </el-card>
-    <el-card style="margin-left: 0px;width:31%; float: left">
-      <el-table :data="gridData" :header-cell-style="{fontFamily:'YouYuan',fontSize:'13px',fontWeight:200}" :summary-method="getSummaries" border class="subTableHeader" size="mini" show-summary style="">
-        <el-table-column width="50" align="center" type="index" label="序号"/>
-        <el-table-column min-width="120" align="center" label="发票号">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 }}
-          </template>
-        </el-table-column>
-        <el-table-column min-width="170" align="center" label="供应商" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="开票金额" width="100px" prop="开票金额">
-          <template slot-scope="scope">
-            {{ scope.row.开票金额.toFixed(2) }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="外购备料请款" center style="min-height: 300px" width="800px">
-      <span>供应商：</span>
-      <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" clearable @change="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">
-        <el-option
-          v-for="item in supplier"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="50"/>
-        <el-table-column label="发票号" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.供应商名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票金额" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.开票金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="开票时间" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.开票时间 | formatTime }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <span>合计：<el-input v-model="SUM" size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
-      <el-button type="primary" size="small" style="float:right;margin: 10px 10px 0 10px" icon="el-icon-check" @click="submitRequestFund">提交请款审批</el-button>
-    </el-dialog>
+    </div>
   </div>
 </template>
 <script>import { searchRequestFund, searchOfflineContract, searchOfflineContract1, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/RequestOutsourcingMaterials'
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index 5b8f5e82..ebda6754 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -24,7 +24,7 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  /*width: 1200px;*/
+  width: 1380px;
   position: relative;
   overflow: hidden;
   /*min-height:calc(100vh - 85px);background: url('../../../../static/bg.jpg') repeat;*/