From 2883ed93f2ca5896a6c2b4d4e4b2437650888ac2 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 21 Nov 2019 14:33:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E5=88=B0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingTaskQuery/index.vue            | 194 ++++++++----------
 1 file changed, 81 insertions(+), 113 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index 289167ee..00bab2f6 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -1,117 +1,86 @@
 <template>
   <div class="app-container">
-
-    <el-card>
-      <span>表单号:</span>
-      <el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>
-      <span>外协厂家:</span>
-      <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:150px" clearable/>
-      <span>下达任务日期:</span>
-      <el-date-picker
-        v-model="time"
-        type="date"
-        size="small"
-        placeholder="选择日期"/>
-      <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
-      <el-tooltip :open-delay="1200" effect="dark" content="打印外协采购单" placement="top">
-        <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出外协加工任务单</el-button>
-      </el-tooltip>
-    </el-card>
-
-    <el-card>
-      <el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="350" border @row-click="searchProcess" >
-        <el-table-column label="付款状态" prop="实际付款时间" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small" style="margin: 0px">已付款</el-tag>
-            <el-tag v-else type="info" size="small" style="margin: 0px">未付款</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.表单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
-          <template slot-scope="scope">
-            {{ scope.row.外协厂家 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.任务下达日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协员" prop="外协计划员" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.外协计划员 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="运费" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.运费 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          v-show="!loading2"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
-    </el-card>
-
-    <el-card>
-      <el-table
-        ref="multipleTable"
-        :data="List3"
-        border
-        stripe
-        size="mini"
-        highlight-current-row
-        height="450"
-        tooltip-effect="dark"
-        style="width: 100%;margin-top: 20px"
-        @selection-change="handleSelectionChange">
-        <el-table-column
-          :selectable="selectable"
-          type="selection"
-          align="center"
-          width="55"/>
-        <el-table-column label="收货状态" width="100" align="center">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.到货状态===1" type="success" size="small" style="margin: 0px">已收货</el-tag>
-            <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="零件图号" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.零件名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" >
-          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协工序" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.外协工序 }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px;margin-top: 15px" @click="getSpareParts">收货</el-button>
-    </el-card>
-
+    <el-col :span="10">
+      <el-card>
+        <!--<span>表单号:</span>-->
+        <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:150px"/>-->
+        <span>厂家:</span>
+        <el-input v-model="manufacturers" size="small" placeholder="厂家" style="width:160px" clearable @keyup.enter.native="pageSize=10;pageList=1;fetchData()"/>
+        <!--<span>下达任务日期:</span>-->
+        <!--<el-date-picker-->
+        <!--v-model="time"-->
+        <!--type="date"-->
+        <!--size="small"-->
+        <!--placeholder="选择日期"/>-->
+        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="打印外协采购单" placement="top">
+          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportTable('RWD')">导出单据</el-button>
+        </el-tooltip>
+      </el-card>
+      <el-card>
+        <el-table v-loading="loading2" :data="List" highlight-current-row stripe size="mini" height="380" border @row-click="searchProcess" >
+          <el-table-column label="表单号" prop="表单号" align="center" min-width="200px">
+            <template slot-scope="scope">
+              {{ scope.row.表单号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协厂家" prop="外协厂家" align="center" min-width="200px">
+            <template slot-scope="scope">
+              {{ scope.row.外协厂家 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block" style="margin-top: 10px;">
+          <el-pagination
+            v-show="!loading2"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-card>
+    </el-col>
+    <el-col :span="14">
+      <el-card>
+        <el-button type="info" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">收货</el-button>
+        <el-table ref="multipleTable" :data="List3" border stripe size="mini" highlight-current-row height="425" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column
+            :selectable="selectable"
+            type="selection"
+            align="center"
+            width="55"/>
+          <el-table-column label="收货状态" width="100" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.到货状态===1" type="success" size="small" style="margin: 0px">已收货</el-tag>
+              <el-tag v-else type="info" size="small" style="margin: 0px">未收货</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="零件图号" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="零件名称" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center" >
+            <template slot-scope="scope">
+              {{ scope.row.批次数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="外协工序" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.外协工序 }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-col>
     <el-card>
       <div id="RWD">
         <table cellspacing="0px" align="center" width="100%" style="">
@@ -635,7 +604,6 @@ export default {
     getSpareParts() { // 选入零件
       if (this.OutsouringNumber.length !== 0) {
         Arrival(this.OutsouringNumber).then(response => {
-          console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('到货成功')
             this.contrast = 3000000000000