From 77ebe95beb810e490cfebbd1223922b5e771d892 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sun, 30 Dec 2018 11:14:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReceiptConnectionSheet.js                   | 14 +++++++++++++-
 .../ReceiptConnectionSheet/index.vue            | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
index dfb3b616..0af7fba4 100644
--- a/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
+++ b/src/api/WorkshopProcurement/ReceiptConnectionSheet.js
@@ -49,7 +49,7 @@ export function deleteInvoice(num1, num2) {
     }
   })
 }
-// 传送人接收人初始化
+// 接收人初始化
 export function initPerson() {
   return request({
     url: '',
@@ -61,6 +61,18 @@ export function initPerson() {
     }
   })
 }
+// 传送人初始化
+export function initPerson1() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
+      param: '考核部门编号=5'
+    }
+  })
+}
 // 初始化合同号
 export function initContract() {
   return request({
diff --git a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
index ab70f990..4292a685 100644
--- a/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
+++ b/src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
@@ -19,7 +19,7 @@
       <span>传送人:</span>
       <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px">
         <el-option
-          v-for="item in selectPerson"
+          v-for="item in selectPerson1"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
@@ -160,7 +160,7 @@
         <el-form-item label="传送人" prop="sendPerson">
           <el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
             <el-option
-              v-for="item in selectPerson"
+              v-for="item in selectPerson1"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
@@ -189,7 +189,7 @@
 </template>
 
 <script>
-import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
+import { searchInvoice, addInvoice, editInvoice, deleteInvoice, initPerson, initPerson1, initContract } from '@/api/WorkshopProcurement/ReceiptConnectionSheet'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -201,7 +201,8 @@ export default {
       invoiceNum: '',
       invoiceTime: '',
       transmitValue: '',
-      selectPerson: [], // 传送人接收人
+      selectPerson: [], // 接收人
+      selectPerson1: [], // 传送人
       recipientValue: '',
       contractNum: '',
       pageCurrent1: 1,
@@ -266,6 +267,14 @@ export default {
           })
         }
       })
+      initPerson1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.selectPerson1.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
     },
     searchTable1() {
       this.invoiceNum ? this.check1 = 1 : this.check1 = 0

From 07688282b5374b770cf8bd68ee7008f3f30714e3 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 30 Dec 2018 11:16:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Outsourcing/OutsourcingTaskExecution/index.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 0e01cc71..4dcebb5c 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -1571,8 +1571,6 @@ export default {
   span{
     margin: 10px 0 10px 10px;
   }
-</style>
-<style>
   td{
     width: 100px;
     height: 30px;
@@ -1594,8 +1592,6 @@ export default {
     width: 7%;
     text-align: left;
   }
-</style>
-<style>
   .el-table .chajia {
     background: #EBF953;
   }
@@ -1606,4 +1602,3 @@ export default {
     height: 30px;
   }
 </style>
-

From fbb57f02becded26632e9986d72e07ed6c5a794c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 30 Dec 2018 11:26:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E5=A4=84=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Outsourcing/UnqualifiedTreatment/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
index ad6ebdec..68f6b92e 100644
--- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue
+++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
@@ -78,18 +78,18 @@
             {{ scope.row.废品数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格处理方式" align="center">
+        <el-table-column label="不合格处理方式" width="200" align="center">
           <template slot-scope="scope">
             {{ scope.row.不合格处理方式 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="130px" align="center">
+        <el-table-column label="操作" width="130px" align="center" fixed="right">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
               class="el-icon-edit"
-              @click="handleEdit(scope.$index, scope.row, 'form')">编辑</el-button>
+              @click="handleEdit(scope.$index, scope.row, 'form')">扣款</el-button>
           </template>
         </el-table-column>
 
@@ -107,7 +107,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="20%">
+    <el-dialog :visible.sync="dialogFormVisible1" title="外协价格计算系数维护" center width="400px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" class="demo-ruleForm" label-width="100px" style="width: 90%;margin: auto">
 
         <el-form-item label="废品数量" prop="wasteQuantity">
@@ -165,6 +165,7 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable()
   },
   methods: {
     fetchData() {

From 144b5f9c8a9201779114853e7ecd3a375f74ac7b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sun, 30 Dec 2018 11:33:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=B8=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MaterialArrivalManagement/index.vue       |  2 +-
 .../UnqualifiedTreatment/index.vue            | 32 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 2a147c6f..b8fce6f0 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -7,7 +7,7 @@
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
         <el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
         <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
-        <el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>
+        <!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>-->
       </el-row>
     </el-card>
 
diff --git a/src/views/Outsourcing/UnqualifiedTreatment/index.vue b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
index 68f6b92e..545948fc 100644
--- a/src/views/Outsourcing/UnqualifiedTreatment/index.vue
+++ b/src/views/Outsourcing/UnqualifiedTreatment/index.vue
@@ -138,6 +138,7 @@ import { initOutHelp, searchTable, editList } from '@/api/Outsourcing/Unqualifie
 export default {
   data() {
     return {
+      num_bhg: '',
       count2: 0,
       form: {
         wasteQuantity: '', // 废品数量
@@ -219,24 +220,29 @@ export default {
       }
       this.number = row.外协加工任务单明细流水号
       this.form.wasteQuantity = row.废品数量
+      this.num_bhg = row.批次数量
       this.form.processingMethod = row.不合格处理方式
       this.dialogFormVisible1 = true
     },
     // 提交编辑
     submitEdit() {
-      editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
-        if (response.data[0].result === '1') {
-          this.dialogFormVisible1 = false
-          this.$message({
-            type: 'success',
-            message: '信息更新成功!'
-          })
-          this.searchTable()
-        } else {
-          this.dialogFormVisible1 = false
-          this.$message.error('信息更新失败')
-        }
-      })
+      if (this.form.wasteQuantity > this.num_bhg) {
+        this.$message.error('废品数量大于总数量')
+      } else {
+        editList(this.number, this.form.wasteQuantity, this.form.processingMethod).then(response => {
+          if (response.data[0].result === '1') {
+            this.dialogFormVisible1 = false
+            this.$message({
+              type: 'success',
+              message: '信息更新成功!'
+            })
+            this.searchTable()
+          } else {
+            this.dialogFormVisible1 = false
+            this.$message.error('信息更新失败')
+          }
+        })
+      }
     },
     // 提交添加或者修改
     submit(formName) {