From b1e3de2da1bcbb20b6ff2df4eaff5a5d9ce0655e Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 1 Apr 2020 14:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=8A=A5=E5=BA=9F=E8=A1=A5?=
 =?UTF-8?q?=E6=8A=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PartAssignment/index.vue                   |  3 +++
 .../SparePartsForScrap/index.vue               | 18 +++++++++++++-----
 .../PartDrawingMaintenance/index.vue           |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index aebd5051..e4b1ee95 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -559,7 +559,9 @@
 <script>
 import { DeliveryTimeSelect, initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, Delete, Delete1, editStock, editNum, OutPart, PurchasingDepartmentBack, purchaseRequisition2Back } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
+import { getNowShotTime } from '@/utils/tool'
 import Cookie from 'js-cookie'
+
 export default {
   inject: ['reload'],
   data() {
@@ -1036,6 +1038,7 @@ export default {
     },
     handleAdd() {
       this.addForm('form', [this.dialogFormVisible = true, this.title = '增加'])
+      this.form.请购时间 = getNowShotTime()
     },
     submitAdd(formName) {
       this.$refs[formName].validate((valid) => {
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index f48064ca..98f6e88c 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -10,7 +10,7 @@
         <!--:label="item.label"-->
         <!--:value="item.value"/>-->
         <!--</el-select>-->
-        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
+        <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:150px" filterable clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
             v-for="item in MachineDrawing"
             :key="item.value"
@@ -124,7 +124,7 @@
               fixed="right"
             >
               <template slot-scope="scope">
-                <el-button :disabled="scope.row.批次零件状态 === '2'" type="text" size="mini" icon="el-icon-s-help" @click="handleEdit(scope.row)">报废</el-button>
+                <el-button :disabled="scope.row.批次零件状态 === '2'" type="text" size="mini" icon="el-icon-s-help" @click="handleEdit(scope.$index, scope.row)">报废</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -274,7 +274,7 @@
           <el-input v-model="form.input1" :disabled="true" auto-complete="off" size="small" style="width: 160px"/>
         </el-form-item>
         <el-form-item label="报废数量" prop="报废数量">
-          <el-input-number v-model="form2.报废数量" :step="1" :min="0" :max="PCNumber" size="small" style="width: 160px"/>
+          <el-input-number v-model="form2.报废数量" :step="1" :min="1" :max="PCNumber" size="small" style="width: 160px"/>
         </el-form-item>
         <el-form-item label="报废原因" prop="报废原因">
           <el-input v-model="form2.报废原因" auto-complete="off" size="small" style="width: 160px"/>
@@ -322,6 +322,7 @@ import { MachineDrawingSelect, TeamSelect, TableDataSelect, editSpare, TableDta2
 export default {
   data() {
     return {
+      index: 0,
       remark1: '',
       remark2: '',
       disabledB: false,
@@ -469,10 +470,12 @@ export default {
       this.currentPage2 = 1
       this.pageSize2 = 10
     },
-    handleEdit(row) {
+    handleEdit(index, row) {
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
+      console.log(index)
+      this.index = index
       this.remark1 = ''
       this.remark2 = ''
       this.PCNumber = parseInt(row.批次数量)
@@ -490,7 +493,12 @@ export default {
               if (response.data[0].result === '1') {
                 this.$message.success('报废成功')
                 this.dialogeditVisible = false
-                this.fetchTableData()
+                this.tableData[this.index].报废数量 = this.tableData[this.index].报废数量 + this.form2.报废数量
+                this.tableData[this.index].批次数量 = this.tableData[this.index].批次数量 - this.form2.报废数量
+                if (this.tableData[this.index].批次数量 === 0) {
+                  this.tableData[this.index].批次零件状态 = '2'
+                }
+                // this.fetchTableData()
               } else {
                 this.$message.success('报废失败')
               }
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index df6b0ed9..7437d69b 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -31,12 +31,12 @@
             {{ scope.row.suffix }}
           </template>
         </el-table-column>
-        <el-table-column label="导入时间" align="center" width="150px">
+        <el-table-column label="导入时间" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.上传时间.split(' ')[0] }}
           </template>
         </el-table-column>
-        <el-table-column label="导入人" align="center" width="80px">
+        <el-table-column label="导入人" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.导入人 }}
           </template>