Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -438,7 +438,6 @@ export default {
       }
     },
     tableRowClassName1({ row }) {
-      console.log(row)
       if (parseInt(row.报废数量) > parseInt(row.补投数量)) {
         return 'baofei'
       }
@@ -477,7 +476,6 @@ export default {
       this.remark1 = ''
       this.remark2 = ''
       this.PCNumber = parseInt(row.批次数量)
-      console.log(this.Number, 111)
       this.title = row.零件名称
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号

src/views/ManufacturingCenter/StatusQuery/index.vue

@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { intPartState, searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
+import { searchTable, searchmachine, searchgroup } from '@/api/ManufacturingCenter/StatusQuery'
 export default {
   data() {
     return {
@@ -104,7 +104,22 @@ export default {
       partNumber: '', // 零件号
       partStateValue: null, // 零件状态
       partStateValue1: null,
-      partState: [], // 零件状态数组
+      partState: [{
+        value: 3,
+        label: '已投产'
+      }, {
+        value: 6,
+        label: '工艺完成'
+      }, {
+        value: 7,
+        label: '加工完成'
+      }, {
+        value: 8,
+        label: '入库'
+      }, {
+        value: 9,
+        label: '出库'
+      }], // 零件状态数组
       partTypeValue: null, // 零件类型
       num: null,
       pageCurrent: 1,
@@ -131,14 +146,14 @@ export default {
   },
   methods: {
     fetchData() {
-      intPartState().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.partState.push({
-            label: response.data[i].考核状态名称,
-            value: response.data[i].考核状态
-          })
-        }
-      })
+      // intPartState().then(response => {
+      //   for (let i = 0; i < response.data.length; i++) {
+      //     this.partState.push({
+      //       label: response.data[i].考核状态名称,
+      //       value: response.data[i].考核状态
+      //     })
+      //   }
+      // })
       searchmachine().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineTool.push({
@@ -180,10 +195,12 @@ export default {
           } else if (response.data.result[i].考核状态 === 5) {
             response.data.result[i].考核状态 = 2
           } else if (response.data.result[i].考核状态 === 6) {
-            response.data.result[i].考核状态 = 3
+            response.data.result[i].考核状态 = 2
           } else if (response.data.result[i].考核状态 === 7) {
-            response.data.result[i].考核状态 = 4
+            response.data.result[i].考核状态 = 3
           } else if (response.data.result[i].考核状态 === 8) {
+            response.data.result[i].考核状态 = 4
+          } else if (response.data.result[i].考核状态 === 9) {
             response.data.result[i].考核状态 = 5
           }
         }

src/views/ManufacturingCenter/TraceabilityOfParts/index.vue

@@ -140,7 +140,7 @@
           <el-divider content-position="right">跳转链接</el-divider>
           <el-row style="margin-left: 20px">
             <el-tooltip :open-delay="1000" effect="dark" content="转到零件状态查询模块" placement="top">
-              <el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
+              <el-button size="medium" type="text" @click="toStatusQuery">自制件状态查询</el-button>
             </el-tooltip>
             <el-divider direction="vertical"/>
             <!--<el-tooltip :open-delay="1000" effect="dark" content="转到加工进度查询模块" placement="top">-->
@@ -192,13 +192,13 @@ export default {
         type: '',
         size: 'large'
       }, {
-        id: 5,
+        id: 4,
         content: '工艺定额',
         timestamp: '工艺部：工艺员',
         type: '',
         size: 'large'
       }, {
-        id: 7,
+        id: 6,
         content: '生产加工',
         timestamp: '金工车间：操作工',
         type: '',
@@ -343,8 +343,8 @@ export default {
         }
       })
       SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => {
-        console.log(response, 8)
         for (let i = 0; i < this.activities.length; i++) {
+          console.log(response.data[0].考核状态.toString(), this.activities[i].id.toString())
           if (response.data[0].考核状态.toString() === this.activities[i].id.toString()) {
             for (let j = 0; j <= i; j++) {
               this.activities[j].type = 'success'
@@ -353,12 +353,10 @@ export default {
           }
         }
       })
-      console.log(item, 11)
       this.tableData1 = []
       gettabledata1(item.name).then(response => {
         if (response.data.length !== 0) {
           for (let i = 0; i < response.data.length; i++) {
-            console.log(response.data[i])
             this.tableData1.push({
               工艺名称: response.data[i].工艺名称,
               工序顺序: response.data[i].工序顺序,