From 4e64d6224429dd56b5760b5cdaa9b2ff5191044d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 27 Dec 2018 16:41:06 +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

---
 .../SparePartsForScrap/index.vue              | 153 +++++++++---------
 1 file changed, 77 insertions(+), 76 deletions(-)

diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index 2afd1167..35a3c0ac 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -4,7 +4,6 @@
 
     <el-card>
       <div>
-        <!--项目名称-->
         <span>项目名称:</span>
         <el-select v-model="ProjectNameValue" placeholder="请选择项目名称" style="width:200px" clearable size="small" @change="fetchMachineDrawingData" @clear="MachineDrawingValue = '';MachineDrawing = [];Team = [];TeamValue = ''">
           <el-option
@@ -13,7 +12,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--机床号-->
         <span style="margin-left: 15px">机床号:</span>
         <el-select v-model="MachineDrawingValue" placeholder="请选择机床图号" style="width:200px" clearable size="small" @change="fetchTeamDrawingData" @clear="Team = [];TeamValue = ''">
           <el-option
@@ -22,7 +20,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <!--组号-->
         <span style="margin-left: 15px">组号:</span>
         <el-select v-model="TeamValue" placeholder="请选择组号" style="width:200px" clearable size="small">
           <el-option
@@ -88,11 +85,11 @@
         <el-table-column
           align="center"
           prop="province7"
-          label="批次零件状态"
+          label="零件状态"
         >
           <template slot-scope="scope">
-            <div v-if="scope.row.批次零件状态 === '2'">停产</div>
-            <div v-else >正常生产</div>
+            <el-tag v-if="scope.row.批次零件状态 === '2'" type="info" size="small">停产</el-tag>
+            <el-tag v-else type="success" size="small">生产</el-tag>
           </template>
         </el-table-column>
         <el-table-column
@@ -102,7 +99,7 @@
           width="100px"
         >
           <template slot-scope="scope" >
-            <el-button type="primary" size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="scope.row.批次零件状态 === '2'" type="primary" size="small" @click="handleEdit(scope.row)">停产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -185,61 +182,6 @@
           @current-change="handleCurrentChange2"/>
       </div>
     </el-card>
-    <!--编辑对话框-->
-    <div style="text-align: left">
-      <el-dialog :visible.sync="dialogeditVisible" title="编辑" style="width: 800px;margin: auto" center >
-        <el-form ref="form" :model="form" label-position="left">
-          <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-            <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
-          </el-form-item>
-          <el-form-item label="批次零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
-            <el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
-              <el-radio-button label="正常生产"/>
-              <el-radio-button label="停止生产"/>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-            <el-date-picker
-              v-model="input3"
-              value-format="yyyy-MM-dd"
-              size="small"
-              type="date"
-              placeholder="选择日期"/>
-          </el-form-item>
-          <el-form-item label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-            <el-date-picker
-              v-model="input4"
-              value-format="yyyy-MM-dd"
-              size="small"
-              type="date"
-              placeholder="选择日期"/>
-          </el-form-item>
-        </el-form>
-        <div style="margin-right: 60px;margin-top: 10px">
-          <el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
-          <el-button type="primary" @click="submit('form')">确定</el-button>
-        </div>
-      </el-dialog>
-    </div>
-
-    <el-dialog :visible.sync="dialogeditVisible1" title="停产记录" style="width: 800px;margin: auto" center>
-      <el-form ref="form2" :model="form2" label-position="left">
-        <el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-input v-model="form2.reason" auto-complete="off"/>
-        </el-form-item>
-        <el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-date-picker
-            v-model="form2.time"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="选择日期"/>
-        </el-form-item>
-      </el-form>
-      <div style="margin-left: 140px;margin-top: 10px">
-        <el-button type="primary" @click="submitRemark()">确定</el-button>
-      </div>
-    </el-dialog>
 
     <el-card>
       <div>停产后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
@@ -248,19 +190,19 @@
         <el-input v-model="inputA" auto-complete="off" style="width: 200px" size="small"/>
         <span>开始工序</span>
         <el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
-        <el-button :disabled="disabled" type="success" size="small" @click="editA">补投接着生产零件</el-button>
+        <el-button type="success" size="small" @click="editA">补投接着生产零件</el-button>
       </div>
-      <div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>
+      <!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
       <div style="margin-top: 20px; display: block">
         <span>补投重新加工零件数量</span>
         <el-input v-model="inputC" auto-complete="off" style="width: 200px" size="small" />
         <span>开始工序</span>
         <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 200px" size="small"/>
-        <el-button :disabled="disabledB" type="success" size="small" @click="editB">补投重新生产零件</el-button>
+        <el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
 
-    <el-card>
+    <el-card v-show="false">
       <el-table
         :data="tableData4"
         height="250"
@@ -295,11 +237,75 @@
       </el-table>
     </el-card>
 
+    <el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
+      <el-form ref="form" :model="form" label-position="left">
+        <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
+        </el-form-item>
+        <el-form-item label="停产原因" label-width="100px" prop="reason" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.reason" auto-complete="off" style="margin-left: 20px"/>
+        </el-form-item>
+        <el-form-item label="停产时间" label-width="120px" prop="time" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-date-picker
+            v-model="form2.time"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+        <el-form-item v-show="false" label="零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
+          <el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
+            <el-radio-button label="正常生产"/>
+            <el-radio-button label="停止生产"/>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-show="false" label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
+          <el-date-picker
+            v-model="input3"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+        <el-form-item v-show="false" label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
+          <el-date-picker
+            v-model="input4"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+      </el-form>
+      <div style="margin-right: 60px;margin-top: 10px">
+        <el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
+        <el-button type="primary" @click="submit('form')">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
+      <el-form ref="form2" :model="form2" label-position="left">
+        <el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.reason" auto-complete="off"/>
+        </el-form-item>
+        <el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-date-picker
+            v-model="form2.time"
+            value-format="yyyy-MM-dd"
+            size="small"
+            type="date"
+            placeholder="选择日期"/>
+        </el-form-item>
+      </el-form>
+      <div style="margin-left: 140px;margin-top: 10px">
+        <el-button type="primary" @click="submitRemark()">确定</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, TableData3Select, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { ProjectNameSelect, MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
 export default {
   data() {
     return {
@@ -361,6 +367,7 @@ export default {
   },
   created() {
     this.fetchProjectNameData()
+    this.fetchTableData()
   },
   methods: {
     // 项目名称查询
@@ -453,7 +460,7 @@ export default {
       this.radio === '正常生产' ? this.temp = '1' : this.temp = '2'
       const Time = await editTime(this.code, this.input3, this.input4)
       const Char = await editchar(this.remark1, this.remark2, this.code)
-      const Stop = await editStop(this.code, this.temp)
+      const Stop = await editStop(this.code, 2)
       if (Time.data[0].result === '1' && Char.data[0].result === '1' && Stop.data[0].result === '1') {
         this.dialogeditVisible = false
         this.$message.success('信息更新成功')
@@ -481,10 +488,7 @@ export default {
         editA(this.CutCodeBefore, this.inputA, this.inputB).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('补投成功')
-            this.disabled = true
-            TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
-              this.tableData4 = response.data
-            })
+            this.fetchTableData()
           } else {
             this.$message.error('补投失败')
           }
@@ -496,10 +500,7 @@ export default {
         editA(this.CutCodeBefore, this.inputC, this.inputD).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('补投成功')
-            this.disabledB = true
-            TableData3Select(0, this.ProjectNameValue, 0, this.MachineDrawingValue, 0, this.TeamValue, 0, this.ComponentPartsBasicCattleTaxNumber, 0, this.CutCode, 1, this.CutCodeBefore).then(response => {
-              this.tableData4 = response.data
-            })
+            this.fetchTableData()
           } else {
             this.$message.error('补投失败')
           }