From fd63e551f4c77a330f49b5f1a413f4c13559c07a Mon Sep 17 00:00:00 2001
From: lixin <lixin@meswork.com>
Date: Mon, 19 Nov 2018 10:07:11 +0800
Subject: [PATCH] lx

---
 src/views/Inventory/PickingList/index.vue | 71 ++++++++++++++---------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 2ab5ffb1..91df82e9 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -23,8 +23,8 @@
             {{ scope.row.领料单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领料时间" align="center" min-width="200">
-          <template slot-scope="scope">
+        <el-table-column label="领料时间" align="center" min-width="200" >
+          <template slot-scope="scope" value-format="yyyy-MM-dd">
             {{ scope.row.领料时间 }}
           </template>
         </el-table-column>
@@ -336,37 +336,37 @@
     </el-card>
     <!--基本件领料对话框-->
     <el-dialog :visible.sync="dialogFormVisible1" title="基本件通用件领料" center width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left">
-        <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
+      <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-item>
-        <el-form-item label="出库备注" prop="TotalContractAmount" label-width="100px">
+        <el-form-item label="出库备注" prop="outNote" label-width="100px">
           <el-input v-model="form.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()">确 定</el-button>
+        <el-button type="primary" @click="addBasicListDetail(form)">确 定</el-button>
       </div>
     </el-dialog>
     <!--外购件领料对话框-->
     <el-dialog :visible.sync="dialogFormVisible" title="外购件标准件领料" center width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left">
-        <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
+      <el-form ref="form" :model="form" :rules="rules2" 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-item>
-        <el-form-item label="出库备注" prop="TotalContractAmount" label-width="100px">
+        <el-form-item label="出库备注" prop="outNote" label-width="100px">
           <el-input v-model="form.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()">确 定</el-button>
+        <el-button type="primary" @click="execaddListDetail(form)">确 定</el-button>
       </div>
     </el-dialog>
     <!--车间采购件领料对话框-->
     <el-dialog :visible.sync="dialogFormVisibleWork" title="车间采购件领料" center width="380px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm">
         <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
           <el-input v-model="form.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
         </el-form-item>
@@ -381,7 +381,7 @@
     </el-dialog>
     <!--编辑领料明细对话框-->
     <el-dialog :visible.sync="dialogFormVisible2" title="领料单明细" center width="380px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
+      <el-form ref="form2" :model="form2" :rules="rules3" label-position="left" class="demo-ruleForm">
         <el-form-item label="出库数量" prop="ContractNumberValue" label-width="100px" size="small">
           <el-input v-model="form2.OutNumber" size="small" placeholder="出库数量" style="width: 200px"/>
         </el-form-item>
@@ -508,7 +508,8 @@ export default {
       tableDataHouse: [],
       listLoadingx: '',
       purchaseDetailNum: '',
-      dialogFormVisibleWork: false
+      dialogFormVisibleWork: false,
+      time: []
     }
   },
   computed: {
@@ -617,9 +618,13 @@ export default {
     searchListinfor() {
       this.listLoading2 = true
       searchList(this.PageCurrent2, this.PageSize2, 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
+        console.log(response)
       })
     },
     handleSizeChange2(val) {
@@ -723,21 +728,25 @@ export default {
       this.materialNumber = row.零件图号
       console.log(this.receive, 41645)
     },
-    addBasicListDetail() {
+    addBasicListDetail(formName) {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
       } if (this.form.OutNumber === '') {
         this.$message.error('请输入领用数量')
       }
-      addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-        } else {
-          this.$message.error('增加失败')
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('增加成功')
+            } else {
+              this.$message.error('增加失败')
+            }
+          })
+          this.dialogFormVisible1 = false
+          this.searchListinfor()
         }
       })
-      this.dialogFormVisible1 = false
-      this.searchListinfor()
     },
     // 增加外购件领料单明细
     addListDetailinfor(row) {
@@ -759,22 +768,26 @@ export default {
       this.dialogFormVisible = true
       this.purchaseDetailNum = row.采购合同明细流水号
     },
-    execaddListDetail() {
+    execaddListDetail(formName) {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
       } else if (this.OutNumber === '') {
         this.$message.error('请输入领用数量')
       } else {
-        addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('增加成功')
-          } else {
-            this.$message.error('增加失败')
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('增加成功')
+              } else {
+                this.$message.error('增加失败')
+              }
+            })
           }
         })
+        this.dialogFormVisible = false
+        this.searchListinfor()
       }
-      this.dialogFormVisible = false
-      this.searchListinfor()
     },
     // 增加车间采购领料单明细
     addWorkshopDetailinfor(row) {