From 53dc8c02143c74b61bd9d84ba8f94423e08e92a6 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Tue, 2 Apr 2019 10:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/PickingList/index.vue         |  7 ++++++-
 .../PurchasingCenter/OfflineContract/index.vue    | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index d28d6e04..9419b230 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -168,6 +168,11 @@
             {{ scope.row.待出库数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="可出库数量" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.待出库数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="仓库" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.仓库名称 }}
@@ -904,7 +909,7 @@ export default {
       } else {
         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.form1.outNumber, this.partType, this.form1.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()
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 8590800a..32fb60b0 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -141,9 +141,9 @@
         </el-table-column>
         <el-table-column label="合同状态" align="center" width="100" fixed="left">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
-            <el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
-            <el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
+            <el-tag v-if="editing(scope.row)" type="warning" size="small">编辑中</el-tag>
+            <el-tag v-if="purchasing(scope.row)" type="primary" size="small">已采购</el-tag>
+            <el-tag v-if="arrival(scope.row)" type="success" size="small">全部到货</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="离线合同编号" align="center" min-width="170">
@@ -596,6 +596,15 @@ export default {
     this.searchTable2()
   },
   methods: {
+    editing(row) {
+      return Number(row.离线合同状态) === 1
+    },
+    purchasing(row) {
+      return Number(row.离线合同状态) === 2 && Number(row.总采购数量) !== Number(row.总到货数量)
+    },
+    arrival(row) {
+      return Number(row.总采购数量) === Number(row.总到货数量) && Number(row.总采购数量) !== 0
+    },
     useqrcode(contractNum) {
       const opts = {
         errorCorrectionLevel: 'H',