From f30a0639b0338536b8fb07bca28a1c0d021c7d0b Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 29 Mar 2019 11:27:36 +0800
Subject: [PATCH 1/3] fix bug

---
 src/api/Inventory/PickingList.js          |  14 +-
 src/views/Inventory/PickingList/index.vue | 863 +++++++++++-----------
 2 files changed, 419 insertions(+), 458 deletions(-)

diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js
index d0a337d7..d9b753bc 100644
--- a/src/api/Inventory/PickingList.js
+++ b/src/api/Inventory/PickingList.js
@@ -124,7 +124,7 @@ export function dropList(PickingListNumberx) {
     }
   })
 }
-// 删除领料单
+// 删除领料单明细
 export function dropListDetail(DetailNumberx) {
   return request({
     url: '',
@@ -148,15 +148,3 @@ export function addListDetail(PickingListNumberx, projectnumber, machinenumber,
     }
   })
 }
-// 修改领料单明细
-export function editListDetail(data1, data2, data3) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间装配管理_领料单_领料单明细修改',
-      param: '领料单明细流水号=' + data1 + '&出库数量=' + data2 + '&备注=' + data3
-    }
-  })
-}
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 9b85f6ab..8fc17527 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -8,7 +8,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading2" :data="tableData1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="chooseListinfor">
+      <el-table v-loading="listLoading0" :data="tableData1" highlight-current-row border style="width: 100%;" size="mini" height="300" @row-click="chooseListinfor">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="领料单编号" align="center" min-width="200">
           <template slot-scope="scope">
@@ -17,7 +17,7 @@
         </el-table-column>
         <el-table-column label="领料时间" align="center" min-width="200" >
           <template slot-scope="scope">
-            {{ scope.row.领料时间 }}
+            {{ scope.row.领料时间.split(' ')[0] }}
           </template>
         </el-table-column>
         <el-table-column label="领料人" align="center" min-width="130">
@@ -33,15 +33,15 @@
       </el-table>
       <div class="block" style="margin: 10px 0;">
         <el-pagination
-          :current-page="PageCurrent2"
+          :current-page="PageCurrent0"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
-          :total="total2"
+          :page-size="PageSize0"
+          :total="total0"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
+          @size-change="handleSizeChange0"
+          @current-change="handleCurrentChange0"/>
       </div>
-      <el-table v-loading="listLoading3" :data="tableDataPicking" border style="width: 100%;" size="mini" height="300">
+      <el-table :data="tableDataPicking" border style="width: 100%;" size="mini" height="300">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -95,7 +95,6 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <!--<el-button :disabled="!!scope.row.是否出库" size="mini" type="primary" icon="el-icon-edit" @click="editListDetailx(scope.row)">编辑</el-button>-->
             <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
           </template>
         </el-table-column>
@@ -132,7 +131,7 @@
 
     <el-card>
       <h4>自制件</h4>
-      <el-table v-loading="listLoading" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
+      <el-table v-loading="listLoading1" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="项目名称" align="center" min-width="80">
           <template slot-scope="scope">
@@ -191,23 +190,23 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicListDetailinfor(scope.row)">领料</el-button>
+            <el-button :disabled="scope.row.是否禁用" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin: 10px 0;">
         <el-pagination
-          :current-page="PageCurrent"
+          :current-page="PageCurrent1"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
-          :total="total"
+          :page-size="PageSize1"
+          :total="total1"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
       </div>
       <hr>
       <h4>采购部采购件</h4>
-      <el-table v-loading="listLoading1" :data="tableDataPurchase" highlight-current-row border style="width: 100%;" size="mini" height="440">
+      <el-table v-loading="listLoading2" :data="tableDataPurchase" border style="width: 100%;" size="mini" height="440">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="80">
           <template slot-scope="scope">
@@ -271,7 +270,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addListDetailinfor(scope.row)">领料</el-button>
+            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addPurchaseList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -279,15 +278,87 @@
         <el-pagination
           :current-page="PageCurrent1"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
+          :page-size="PageSize1"
           :total="total1"
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
       <hr>
+      <h4>可领滞货件</h4>
+      <el-table v-loading="listLoading3" :data="tableDataBacklog" border style="width: 100%;" size="mini" height="440">
+        <el-table-column label="序号" align="center" type="index" width="50"/>
+        <el-table-column label="名称" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格" align="center" min-width="150">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="图号或型号" align="center" min-width="120">
+          <template slot-scope="scope">
+            {{ scope.row.物料型号 || scope.row.零件图号 || '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="组号" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </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="100">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="货位存量" align="center" width="120">
+          <template slot-scope="scope">
+            123123123
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="待出库数量" align="center" width="120">
+          <template slot-scope="scope">
+            123123123
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="可出库数量" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.可出库数量 = scope.row.货位存量 - scope.row.待出库数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template slot-scope="scope" align="center">
+            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addListDetailinfor(scope.row)">领料</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin: 10px 0;">
+        <el-pagination
+          :current-page="PageCurrent3"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSize3"
+          :total="total3"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange3"
+          @current-change="handleCurrentChange3"/>
+      </div>
+      <hr>
       <h4>车间采购件</h4>
-      <el-table v-loading="listLoadingx" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
+      <el-table v-loading="listLoading4" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="名称" align="center" min-width="80">
           <template slot-scope="scope">
@@ -351,194 +422,91 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addWorkshopDetailinfor(scope.row)">领料</el-button>
+            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addWorkshopList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin: 10px 0;">
         <el-pagination
-          :current-page="PageCurrentx"
+          :current-page="PageCurrent4"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
-          :total="totalx"
+          :page-size="PageSize4"
+          :total="total4"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChangex"
-          @current-change="handleCurrentChangex"/>
+          @size-change="handleSizeChange4"
+          @current-change="handleCurrentChange4"/>
       </div>
     </el-card>
+
     <!--基本件领料对话框-->
     <el-dialog :visible.sync="dialogFormVisible1" title="基本件通用件领料" center width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm">
-        <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
-          <el-input v-model="form.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
+        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form1.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+          <el-input v-model="form1.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="addBasicListDetail('form')">确 定</el-button>
+        <el-button @click="dialogFormVisible1=false">取消</el-button>
+        <el-button type="primary" @click="submitAddBasicList()">确 定</el-button>
       </div>
     </el-dialog>
     <!--外购件领料对话框-->
-    <el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px">
+    <el-dialog :visible.sync="dialogFormVisible2" title="外购件标准件领料" center width="380px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" class="demo-ruleForm">
         <el-form-item label="领料单号" label-width="100px" size="small">
           <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
         </el-form-item>
-        <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
-          <el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
+        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form2.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
           <el-input v-model="form2.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="execaddListDetail('form2')">确 定</el-button>
+        <el-button @click="dialogFormVisible2=false">取消</el-button>
+        <el-button type="primary" @click="submitAddPurchaseList()">确 定</el-button>
       </div>
     </el-dialog>
     <!--车间采购件领料对话框-->
-    <el-dialog :visible.sync="dialogFormVisibleWork" title="车间采购件领料" center width="380px">
-      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" class="demo-ruleForm">
+    <el-dialog :visible.sync="dialogFormVisible4" title="车间采购件领料" center width="380px">
+      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
         <el-form-item label="领料单号" label-width="100px" size="small">
           <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
         </el-form-item>
-        <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
-          <el-input v-model="form3.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form3.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="addWorkshopListDetail('form3')">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--编辑领料明细对话框-->
-    <el-dialog :visible.sync="dialogFormVisible2" title="领料单明细" center width="380px">
-      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
-        <el-form-item label="出库数量" prop="OutNumber" label-width="100px" size="small">
-          <el-input v-model="form4.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
+        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form4.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="出库备注" prop="outNote" label-width="100px">
           <el-input v-model="form4.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form4')">取消</el-button>
-        <el-button type="primary" @click="submitChannge()">确 定</el-button>
+        <el-button @click="dialogFormVisible4=false">取消</el-button>
+        <el-button type="primary" @click="submitAddWorkshopList()">确 定</el-button>
       </div>
     </el-dialog>
-    <!--领料单-->
-    <!--<el-card v-show="card">-->
-    <!--<table cellspacing="0px" align="center" id="cjn" width="100%" style="">-->
-    <!--<tbody id="1">-->
-    <!--<tr>-->
-    <!--<td colspan="4" style="text-align: left;font-size: 30px;font-weight: bold">GAOJING</td>-->
-    <!--<td colspan="24" style="text-align:center;font-size: 30px;font-weight: bold">领料单</td>-->
-    <!--</tr>-->
-    <!--<tr class="tbodyHead">-->
-    <!--<td colspan="2">领料单号:</td>-->
-    <!--<td colspan="6">{{任务单号}}</td>-->
-    <!--<td colspan="4">领料日期:</td>-->
-    <!--<td colspan="4">{{任务下达日期}}</td>-->
-    <!--<td colspan="3">领料人:</td>-->
-    <!--<td colspan="9">{{外协厂家}}</td>-->
-    <!--</tr>-->
-    <!--<tr id="tableHead">-->
-    <!--<td style="width: 2%">序号</td>-->
-    <!--<td colspan="5">物料型号</td>-->
-    <!--<td colspan="2" style="width: 4%">物料名称</td>-->
-    <!--<td colspan="2" style="width: 4%">物料规格</td>-->
-    <!--<td colspan="9" width="30%">数量</td>-->
-    <!--<td colspan="1">项目名称</td>-->
-    <!--<td>机床名称</td>-->
-    <!--<td>组件名称</td>-->
-    <!--<td>备注</td>-->
-    <!--</tr>-->
-    <!--</tbody>-->
-    <!--</table>-->
-    <!--</el-card>-->
   </div>
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchList, addList, dropList, addListDetail, searchListDetail, dropListDetail, editListDetail, searchHoursePart } from '@/api/Inventory/PickingList'
+import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchList, addList, dropList,
+  addListDetail, searchListDetail, dropListDetail, searchHoursePart } from '@/api/Inventory/PickingList'
 import { mapGetters } from 'vuex'
-// import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
 export default {
   data() {
     return {
-      ProjectValue: '',
-      Project: [],
-      ProjectValue_check: 1,
-      MachineValue: null,
-      Machine: [],
-      MachineValue_check: 0,
-      GroupNumValue: null,
-      GroupNumValue_check: 0,
-      GroupNum: [],
-      tableDataBasic: [],
-      tableDataPurchase: [],
-      tableData1: [],
-      tableDataPicking: [], // 领料单明细表格
-      listNumber: '',
-      pickingListNumber: null, // 领料单编号
-      pickingListNumberx: '', // 领料单流水号
-      picikingPeople: '', // 领料人流水号
-      partProjectNumber: '', // 项目流水号
-      partProjectName: '', // 项目名称
-      partMachineNumber: '', // 机床流水号
-      partMachineName: '', // 机床名称
-      partGroupNumber: '', // 分组流水号
-      partGroupName: '', // 分组名称
-      form: { // 基本件出库
-        OutNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules: { // 表单验证规则
-        OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form2: { // 外购件出库
-        OutNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules2: { // 表单验证规则
-        OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }]
-        // outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form3: { // 车间采购出库
-        OutNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules3: { // 表单验证规则
-        OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form4: {
-        OutNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules4: { // 表单验证规则
-        OutNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      partType: '', // 零件类型
-      craftplannumber: '', // 工艺计划流水号
-      receive: '', // 收件信息ID
-      teamPart: '', // 组件零件流水号
-      locatenumber: '', // 货位流水号
-      listLoading: false,
-      listLoading1: false,
-      listLoading2: false,
-      listLoading3: false,
-      PageCurrent: 1,
-      PageSize: 10,
-      total: 0,
+      listLoading0: false, // 领料单
+      listLoading1: false, // 自制件
+      listLoading2: false, // 采购部采购件
+      listLoading3: false, // 滞货件
+      listLoading4: false, // 车间采购件
+      PageCurrent0: 1,
+      PageSize0: 10,
+      total0: 0,
       PageCurrent1: 1,
       PageSize1: 10,
       total1: 0,
@@ -548,30 +516,80 @@ export default {
       PageCurrent3: 1,
       PageSize3: 10,
       total3: 0,
-      PageCurrentx: 1,
-      PageSizex: 10,
-      totalx: 0,
+      PageCurrent4: 1,
+      PageSize4: 10,
+      total4: 0,
+      ProjectValue: '',
+      Project: [],
+      ProjectValue_check: 0,
+      MachineValue: '',
+      Machine: [],
+      MachineValue_check: 0,
+      GroupNumValue: '',
+      GroupNum: [],
+      GroupNumValue_check: 0,
+      tableData1: [], // 领料单
+      tableDataPicking: [], // 领料单明细
+      tableDataBasic: [], // 自制件
+      tableDataPurchase: [], // 采购部采购件
+      tableDataBacklog: [], // 滞货件
+      tableDataHouse: [], // 车间采购件
+      form1: { // 基本件出库
+        outNumber: '', // 出库数量
+        outNote: '' // 出库备注
+      },
+      rules1: { // 表单验证规则
+        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
+        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
+      },
+      form2: { // 外购件出库
+        outNumber: '', // 出库数量
+        outNote: '' // 出库备注
+      },
+      rules2: { // 表单验证规则
+        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
+        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
+      },
+      form3: { // 车间采购出库
+        outNumber: '', // 出库数量
+        outNote: '' // 出库备注
+      },
+      rules3: { // 表单验证规则
+        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
+        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
+      },
+      form4: {
+        outNumber: '', // 出库数量
+        outNote: '' // 出库备注
+      },
+      rules4: { // 表单验证规则
+        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
+        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
+      },
+      dialogFormVisible1: false, // 自制件
+      dialogFormVisible2: false, // 采购部采购件
+      dialogFormVisible3: false, // 滞货件
+      dialogFormVisible4: false, // 车间采购件
+      enableOut: '', // 可出库数量
+      partPiant: '', // 零件图号
+      material: '', // 材料
+      outType: '',
+      pickingListNumber: null, // 领料单编号
+      pickingListNumberx: '', // 领料单流水号
+      picikingPeople: '', // 领料人流水号
+      partProjectNumber: '', // 项目流水号
+      partMachineNumber: '', // 机床流水号
+      partGroupNumber: '', // 分组流水号
+      receive: '', // 收件信息ID
+      locatenumber: '', // 货位流水号
       materialName: '',
       materialNumber: '',
       materialType: '',
-      dialogFormVisible: false,
-      dialogFormVisible1: false,
-      dialogFormVisible2: false,
-      card: true,
-      pickingListDetail: '',
-      tableDataHouse: [],
-      listLoadingx: '',
       purchaseDetailNum: '', // 采购合同明细流水号
       askPurchaseNumber: '', // 请购单明细流水号
-      dialogFormVisibleWork: false,
-      time: [],
       materialLocate: '',
-      enableOut: '',
-      pickingListNumber_check: 1,
-      outNumber: '',
-      outType: '',
-      material: '', // 材料
-      partPiant: '' // 零件图号
+      partType: '', // 零件类型
+      craftplannumber: '' // 工艺计划流水号
     }
   },
   computed: {
@@ -581,29 +599,111 @@ export default {
   },
   created() {
     this.fetchData()
-    this.getpeopleid()
     this.searchListinfor()
     this.searchPartinfo()
   },
   methods: {
+    // 初始化项目,获取人员编号
     fetchData() {
       this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
-    },
-    // 获取人员编号
-    getpeopleid() {
       this.picikingPeople = this.id
     },
+    // 查询领料单
+    searchListinfor() {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      this.listLoading0 = true
+      searchList(this.PageCurrent0, this.PageSize0, check, this.pickingListNumber).then(response => {
+        this.tableData1 = response.data.rows
+        this.total0 = response.data.total
+        this.listLoading0 = false
+      })
+    },
+    // 领料单分页
+    handleSizeChange0(val) {
+      this.PageCurrent0 = 1
+      this.PageSize0 = val
+      this.searchListinfor()
+    },
+    handleCurrentChange0(val) {
+      this.PageCurrent0 = val
+      this.searchListinfor()
+    },
+    // 创建领料单
+    addListinfor() {
+      this.$confirm('确认创建新的领料单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addList(this.picikingPeople).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.searchListinfor()
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      }).catch(() => {
+        this.$message('已取消操作')
+      })
+    },
+    // 删除领料单
+    dropListinfor(row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.tableDataPicking.length === 0) {
+          dropList(row.领料单流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.searchListinfor()
+            } else {
+              this.$message.error('数据占用')
+            }
+          })
+        } else {
+          this.$message.error('数据占用')
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 删除领料单明细
+    dropListdetail(row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        dropListDetail(row.领料单明细流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchListDetailt()
+            this.searchPartinfo()
+          } else {
+            this.$message.error('数据占用')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     // 查询机床
     searchMachine() {
       this.MachineValue = ''
       this.Machine = []
       this.GroupNumValue = ''
       this.GroupNum = []
-      if (this.ProjectValue === '') {
-        this.ProjectValue_check = 0
-      } else {
-        this.ProjectValue_check = 1
-      }
+      this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
       searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.Machine.push({
@@ -628,15 +728,43 @@ export default {
     },
     // 根据项目机床分组查零件/物料
     searchPartinfo() {
-      this.tableDataPurchase = []
-      this.tableDataBasic = []
       this.ProjectValue ? this.ProjectValue_check = 1 : this.ProjectValue_check = 0
       this.MachineValue ? this.MachineValue_check = 1 : this.MachineValue_check = 0
       this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
-      this.listLoading = true
+      this.searchOwnPart() // 自制件
+      this.searchPurchasePart() // 采购部采购件
+      this.searchBacklogPart() // 滞货件
+      this.searchWorkshopPart() // 车间采购件
+    },
+    // 查询自制件
+    searchOwnPart() {
+      this.tableDataBasic = []
       this.listLoading1 = true
-      this.listLoadingx = true
-      searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+      searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        const data = response.data.rows
+        for (let i = 0; i < data.length; i++) {
+          data[i].可出库数量 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+        }
+        this.tableDataBasic = response.data.rows
+        this.total1 = response.data.total
+        this.listLoading1 = false
+      })
+    },
+    // 自制件分页
+    handleSizeChange1(val) {
+      this.PageCurrent1 = 1
+      this.PageSize1 = val
+      this.searchOwnPart()
+    },
+    handleCurrentChange1(val) {
+      this.PageCurrent1 = val
+      this.searchOwnPart()
+    },
+    // 查询采购部采购件
+    searchPurchasePart() {
+      this.tableDataPurchase = []
+      this.listLoading2 = true
+      searchPurchasePart(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].组件零件基本件流水号 === '0') {
             response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
@@ -655,156 +783,64 @@ export default {
           }
         }
         this.tableDataPurchase = response.data.rows
-        this.listLoading = false
-        this.total1 = response.data.total
-      })
-      searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        const data = response.data.rows
-        for (let i = 0; i < data.length; i++) {
-          data[i].可出库数量 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-        }
-        this.tableDataBasic = response.data.rows
-        this.listLoading1 = false
-        this.total = response.data.total
-      })
-      searchHoursePart(this.PageCurrentx, this.PageSizex, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        console.log(response.data.rows)
-        this.tableDataHouse = response.data.rows
-        this.listLoadingx = false
-        this.totalx = response.data.total
-      })
-    },
-    handleSizeChange(val) {
-      this.PageCurrent1 = 1
-      this.PageSize1 = val
-      this.searchPartinfo()
-    },
-    handleCurrentChange(val) {
-      this.PageCurrent1 = val
-      this.searchPartinfo()
-    },
-    handleSizeChange1(val) {
-      this.PageCurrent = 1
-      this.PageSize = val
-      this.searchPartinfo()
-    },
-    handleCurrentChange1(val) {
-      this.PageCurrent = val
-      this.searchPartinfo()
-    },
-    handleSizeChangex(val) {
-      this.PageCurrentx = 1
-      this.PageSizex = val
-      this.searchPartinfo()
-    },
-    handleCurrentChangex(val) {
-      this.PageCurrentx = val
-      this.searchPartinfo()
-    },
-    // 查询领料单
-    searchListinfor() {
-      if (this.pickingListNumber === null) {
-        this.pickingListNumber_check = 0
-      }
-      this.listLoading2 = true
-      searchList(this.PageCurrent2, this.PageSize2, this.pickingListNumber_check, this.pickingListNumber).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].领料时间 = response.data.rows[i].领料时间.substring(0, response.data.rows[i].领料时间.length - 8)
-        }
-        this.tableData1 = response.data.rows
         this.listLoading2 = false
         this.total2 = response.data.total
       })
     },
+    // 采购部采购件分页
     handleSizeChange2(val) {
       this.PageCurrent2 = 1
       this.PageSize2 = val
-      this.searchListinfor()
+      this.searchPurchasePart()
     },
     handleCurrentChange2(val) {
       this.PageCurrent2 = val
-      this.searchListinfor()
+      this.searchPurchasePart()
+    },
+    // 查询滞货件
+    searchBacklogPart() {
+      this.listLoading3 = true
+      this.tableDataBacklog = []
+      this.listLoading3 = false
+    },
+    // 滞货件分页
+    handleSizeChange3(val) {
+      this.PageCurrent3 = 1
+      this.PageSize3 = val
+      this.searchBacklogPart()
+    },
+    handleCurrentChange3(val) {
+      this.PageCurrent3 = val
+      this.searchBacklogPart()
+    },
+    // 查询车间采购件
+    searchWorkshopPart() {
+      this.tableDataHouse = []
+      this.listLoading4 = true
+      searchHoursePart(this.PageCurrent4, this.PageSize4, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
+        this.tableDataHouse = response.data.rows
+        this.total4 = response.data.total
+        this.listLoading4 = false
+      })
+    },
+    // 车间采购件分页
+    handleSizeChange4(val) {
+      this.PageCurrent4 = 1
+      this.PageSize4 = val
+      this.searchWorkshopPart()
+    },
+    handleCurrentChange4(val) {
+      this.PageCurrent4 = val
+      this.searchWorkshopPart()
     },
     // 查询领料单明细
     searchListDetailt() {
-      this.listLoading3 = true
       searchListDetail(this.pickingListNumberx).then(response => {
         const data = response.data
         for (let i = 0; i < data.length; i++) {
           data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
         }
         this.tableDataPicking = data
-        this.listLoading3 = false
-      })
-    },
-    // 增加领料单
-    addListinfor() {
-      this.$confirm('确认创建新的领料单?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        addList(this.picikingPeople).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('增加成功')
-            this.searchListinfor()
-          } else {
-            this.$message.error('增加失败')
-          }
-        })
-      }).catch(() => {
-        this.$message('已取消操作')
-      })
-    },
-    // 删除领料单
-    dropListinfor(row) {
-      this.pickingListNumberx = row.领料单流水号
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.tableDataPicking.length === 0) {
-          dropList(this.pickingListNumberx).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('删除成功')
-              this.searchListinfor()
-            } else {
-              this.$message.error('数据占用')
-            }
-          })
-        } else {
-          this.$message.error('数据占用')
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 删除领料单明细
-    dropListdetail(row) {
-      this.pickingListDetail = row.领料单明细流水号
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        dropListDetail(this.pickingListDetail).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('删除成功')
-            this.searchListDetailt()
-            this.searchPartinfo()
-          } else {
-            this.$message.error('数据占用')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
       })
     },
     // 选择领料单
@@ -814,138 +850,139 @@ export default {
       this.searchListDetailt()
     },
     // 增加基本件领料单明细
-    addBasicListDetailinfor(row) {
-      this.form = []
-      this.outType = 1
+    addBasicList(row) {
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      this.dialogFormVisible1 = true
+      this.form1.outNumber = ''
+      this.form1.outNote = ''
       this.partProjectNumber = row.项目流水号
-      this.partProjectName = row.项目名称
       this.partMachineNumber = row.机床流水号
-      this.partMachineName = row.机床图号
       this.partGroupNumber = row.组件流水号
-      this.partGroupName = row.组号
       this.partType = row.零件类型
       this.craftplannumber = row.工艺计划流水号
       this.receive = row.收件信息id
-      this.teamPart = row.组件零件流水号
+      this.purchaseDetailNum = ''
+      this.askPurchaseNumber = ''
       this.locatenumber = row.货位流水号
+      this.outType = 1
+      this.materialLocate = ''
       this.materialName = row.零件名称
-      this.materialNumber = row.零件图号
-      this.dialogFormVisible1 = true
       this.materialType = row.零件类型名称
-      this.enableOut = row.可出库数量
+      this.materialNumber = row.零件图号
+      this.material = ''
+      this.enableOut = Number(row.可出库数量)
     },
-    addBasicListDetail(formName) {
+    // 提交增加基本件领料单明细
+    submitAddBasicList() {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
-      } else if (this.form.OutNumber === '' || this.form.OutNumber > this.enableOut) {
-        this.$message.error('请正确输入领用数量')
       } else {
-        this.$refs[formName].validate((valid) => {
+        this.$refs['form1'].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form.outNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible1 = false
               } else {
                 this.$message.error('增加失败')
               }
             })
-            this.dialogFormVisible1 = false
-            this.searchListinfor()
-            this.searchListDetailt()
           }
         })
       }
     },
     // 增加外购件领料单明细
-    addListDetailinfor(row) {
-      this.form2 = {}
-      this.outType = 2
+    addPurchaseList(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.dialogFormVisible2 = true
+      this.form2.outNumber = ''
+      this.form2.outNote = ''
       this.partProjectNumber = row.项目流水号
-      this.partProjectName = row.项目名称
       this.partMachineNumber = row.机床流水号
-      this.partMachineName = row.机床图号
       this.partGroupNumber = row.组件流水号
-      this.partGroupName = row.组号
       this.partType = row.零件类型代码
       this.craftplannumber = row.工艺计划流水号
       this.receive = row.收件信息ID
-      this.teamPart = row.组件零件流水号
+      this.purchaseDetailNum = row.采购合同明细流水号
+      this.askPurchaseNumber = ''
       this.locatenumber = row.货位流水号
+      this.outType = 2
+      this.materialLocate = row.物料与货位对照流水号
       this.materialName = row.物料名称
-      this.materialNumber = row.物料型号
       this.materialType = row.物料规格
-      this.dialogFormVisible = true
+      this.materialNumber = row.物料型号
       this.partPiant = row.零件图号
       this.material = row.材料
-      this.purchaseDetailNum = row.采购合同明细流水号
-      this.materialLocate = row.物料与货位对照流水号
-      this.enableOut = row.货位存量 - row.待出库数量
+      this.enableOut = Number(row.货位存量 - row.待出库数量)
     },
-    execaddListDetail(formName) {
+    // 提交增加外购件领料单明细
+    submitAddPurchaseList() {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
-      } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
-        this.$message.error('请正确输入领用数量')
       } else {
-        this.$refs[formName].validate((valid) => {
+        this.$refs['form2'].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.outNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible2 = false
               } else {
                 this.$message.error('增加失败')
               }
             })
           }
         })
-        this.dialogFormVisible = false
-        this.searchListinfor()
-        this.searchListDetailt()
       }
     },
     // 增加车间采购领料单明细
-    addWorkshopDetailinfor(row) {
-      console.log(row)
-      this.form3 = {}
-      this.outType = 3
+    addWorkshopList(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.dialogFormVisible4 = true
+      this.form4.outNumber = ''
+      this.form4.outNote = ''
       this.partProjectNumber = row.项目流水号
       this.partMachineNumber = row.机床流水号
       this.partGroupNumber = row.组件流水号
       this.partType = row.零件类型
-      this.locatenumber = row.货位流水号
-      this.dialogFormVisibleWork = true
+      this.craftplannumber = ''
+      this.receive = ''
+      this.purchaseDetailNum = ''
       this.askPurchaseNumber = row.请购单明细流水号
-      this.materialLocate = row.物料与货位对照流水号
-      this.enableOut = row.货位存量
+      this.locatenumber = row.货位流水号
+      this.outType = 3
       this.materialName = row.物料名称
-      this.materialNumber = row.物料型号
       this.materialType = row.物料规格
+      this.materialNumber = row.物料型号
       this.partPiant = row.零件图号
       this.material = row.材料
+      this.enableOut = Number(row.货位存量)
     },
-    addWorkshopListDetail(formName) {
-      this.$refs[formName].validate((valid) => {
+    // 提交增加车间采购领料单明细
+    submitAddWorkshopList() {
+      this.$refs['form4'].validate((valid) => {
         if (valid) {
           if (this.pickingListNumberx === '') {
             this.$message.error('请选择领料单')
-          } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
-            this.$message.error('请正确输入领用数量')
           } else {
-            console.log(this.materialLocate)
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.outNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
                 this.searchPartinfo()
-                searchListDetail(this.pickingListNumberx).then(response => {
-                  const data = response.data
-                  for (let i = 0; i < data.length; i++) {
-                    data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-                  }
-                  this.tableDataPicking = data
-                })
-                this.dialogFormVisibleWork = false
+                this.searchListinfor()
+                this.searchListDetailt()
+                this.dialogFormVisible4 = false
               } else {
                 this.$message.error('增加失败')
               }
@@ -953,71 +990,7 @@ export default {
           }
         }
       })
-      this.searchListinfor()
-      this.searchListDetailt()
-    },
-    // 修改领料单明细
-    editListDetailx(row) {
-      this.dialogFormVisible2 = true
-      this.pickingListDetail = row.领料单明细流水号
-      this.form4.OutNumber = row.出库数量
-      this.outNumber = row.出库数量
-      this.form4.outNote = row.备注
-    },
-    submitChannge() {
-      if (this.form4.OutNumber > this.outNumber) {
-        this.$message.error('修改数量须小于领用数量')
-      } else {
-        editListDetail(this.pickingListDetail, this.form4.OutNumber, this.form4.outNote).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('修改成功')
-          } else {
-            this.$message.error('修改失败')
-          }
-        })
-        this.dialogFormVisible2 = false
-        this.searchListDetailt()
-      }
-    },
-    // 重置表单
-    callOff() {
-      this.form.DirectNumber = ''
-      this.form.DirectNote = ''
-      this.dialogFormVisible = false
-      this.dialogFormVisible1 = false
-      this.dialogFormVisible2 = false
-      this.dialogFormVisibleWork = false
-      this.form2.OutNumber = ''
-      this.form2.outNote = ''
-    },
-    // 导出状态
-    handleDownload() {
-      searchListDetail(this.pickingListNumberx).then(response => {
-        return response.data
-      }).then(data => {
-        const a = data
-        require.ensure([], () => {
-          const { export_json_to_excel } = require('@/vendor/Export2Excel')
-          const tHeader = ['物料名称', '物料型号', '物料规格', '项目名称', '机床名称', '组件名称', '领用数量', '备注']
-          const filterVal = ['物料名称', '物料型号', '物料规格', '项目名称', '机床名称', '组件名称', '领用数量', '备注']
-          const list = a
-          const data = this.formatJson(filterVal, list)
-          export_json_to_excel(tHeader, data, '领料单')
-        })
-      })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => v[j]))
     }
-    // downLoadCjn(tableid) {
-    //   if (this.List3.length === 0) {
-    //     this.$message.warning('暂无数据')
-    //   } else {
-    //     getExplorer()
-    //     method5(tableid)
-    //     Cleanup()
-    //   }
-    // }
   }
 }
 </script>

From a9e34652d77a6cc5aa21a5f833ab0499b0864ed8 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 29 Mar 2019 11:33:59 +0800
Subject: [PATCH 2/3] fix bug

---
 src/views/Inventory/PickingList/index.vue | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 8fc17527..cc80590e 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -342,7 +342,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addListDetailinfor(scope.row)">领料</el-button>
+            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addBacklogList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -471,6 +471,24 @@
         <el-button type="primary" @click="submitAddPurchaseList()">确 定</el-button>
       </div>
     </el-dialog>
+    <!--滞货件领料对话框-->
+    <el-dialog :visible.sync="dialogFormVisible3" title="滞货件领料" center width="380px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" class="demo-ruleForm">
+        <el-form-item label="领料单号" label-width="100px" size="small">
+          <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form3.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="出库备注" prop="outNote" label-width="100px">
+          <el-input v-model="form3.outNote" size="small" placeholder="请输入备注" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible3=false">取消</el-button>
+        <el-button type="primary" @click="submitAddBacklogList()">确 定</el-button>
+      </div>
+    </el-dialog>
     <!--车间采购件领料对话框-->
     <el-dialog :visible.sync="dialogFormVisible4" title="车间采购件领料" center width="380px">
       <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
@@ -944,6 +962,10 @@ export default {
         })
       }
     },
+    // 增加滞货件领料单明细
+    addBacklogList(row) {},
+    // 提交增加滞货件领料单明细
+    submitAddBacklogList() {},
     // 增加车间采购领料单明细
     addWorkshopList(row) {
       if (this.$refs['form2'] !== undefined) {

From 4c75a41e56abb388b5cd15e83b5f857640399a1b Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 29 Mar 2019 12:03:25 +0800
Subject: [PATCH 3/3] new file

---
 .../PurchasingCenter/BacklogGoodsPrepare.js   | 13 ++++++
 src/icons/svg/BacklogGoodsPrepare.svg         |  1 +
 .../BacklogGoodsPrepare/index.vue             | 44 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 src/api/PurchasingCenter/BacklogGoodsPrepare.js
 create mode 100644 src/icons/svg/BacklogGoodsPrepare.svg
 create mode 100644 src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue

diff --git a/src/api/PurchasingCenter/BacklogGoodsPrepare.js b/src/api/PurchasingCenter/BacklogGoodsPrepare.js
new file mode 100644
index 00000000..6dc21fe4
--- /dev/null
+++ b/src/api/PurchasingCenter/BacklogGoodsPrepare.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
diff --git a/src/icons/svg/BacklogGoodsPrepare.svg b/src/icons/svg/BacklogGoodsPrepare.svg
new file mode 100644
index 00000000..b0faec93
--- /dev/null
+++ b/src/icons/svg/BacklogGoodsPrepare.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553831911600" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1975" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M510.759 0C228.679 0 0 228.677 0 510.748c0 117.224 39.911 224.892 106.318 311.091l38.377-39.956C95.222 715.203 63.249 634.79 56.233 547.225l220.465 0c16.665 107.625 105.717 190.467 215.8 198.984l0 219.895c-83.913-3.356-161.914-29.321-228.223-72.049l-34.636 42.919c80.66 53.305 177.202 84.525 281.12 84.525 282.078 0 510.748-228.672 510.748-510.752C1021.507 228.677 792.836 0 510.759 0zM492.498 691.544c-79.903-8.023-144.782-66.934-160.493-144.319l160.493 0L492.498 691.544zM492.498 492.502l-162.33 0c8.664-85.968 76.465-153.749 162.33-162.437L492.498 492.502zM492.498 274.489c-116.356 8.884-209.087 101.64-217.971 218.013L55.647 492.502C65.055 255.277 255.29 65.046 492.498 55.623L492.498 274.489zM547.221 56.52C775.889 74.679 956.69 261.363 965.857 492.502L746.951 492.502c-8.415-110.212-92.072-199.151-199.73-215.836L547.221 56.52zM547.221 332.187c77.128 15.798 136.044 80.477 144.089 160.315L547.221 492.502 547.221 332.187zM547.221 547.225l142.252 0c-14.502 71.43-70.847 127.4-142.252 141.949L547.221 547.225zM547.221 965.024 547.221 744.544c101.593-15.785 181.821-95.668 197.559-197.318l220.158 0C947.26 769.922 769.872 947.353 547.221 965.024z" p-id="1976"></path></svg>
\ No newline at end of file
diff --git a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
new file mode 100644
index 00000000..1dddd2ce
--- /dev/null
+++ b/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
@@ -0,0 +1,44 @@
+<template>
+  <div class="app-container">
+    <el-card></el-card>
+  </div>
+</template>
+
+<script>
+import {} from '@/api/PurchasingCenter/BacklogGoodsPrepare'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'BacklogGoodsPrepare',
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {}
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+</style>