加工顺序调整按工艺计划流水号查

src/api/ManufacturingCenter/MachiningSequenceAdjustment.js

@@ -57,7 +57,7 @@ export function JurisdictionControl(num1, num2) {
     }
   })
 }
-// 所有工序
+// 所有工序(原）
 export function getTable2(stepNumber) {
   return request({
     url: '',
@@ -69,6 +69,18 @@ export function getTable2(stepNumber) {
     }
   })
 }
+// 所有工序(新)
+export function getTable3(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_加工进度修改2_查询',
+      param: '工艺计划流水号=' + stepNumber
+    }
+  })
+}
 // 正在加工零件
 export function searchParts(stepNumber) {
   return request({

src/utils/request.js

@@ -22,7 +22,7 @@ export const ServerIP = `http://192.168.1.231:8411/webpage/file/`
 export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图  发布时改成0.231
 export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图   发布时改成0.231
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 

src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

@@ -320,7 +320,7 @@
 </template>
 
 <script>
-import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { searchParts, getMachine, getMachine2, searchtable, getTable3, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 import { wsuri, name } from '@/utils/request'
 export default {
   data() {
@@ -379,7 +379,7 @@ export default {
       })
     },
     getRowKeys(row) {
-      return row.零件图号
+      return row.工艺计划流水号
     },
     selectMachine(row) {
       this.process = []
@@ -388,7 +388,7 @@ export default {
       this.colorCode = []
       this.realDate = []
       this.tableData2 = []
-      getTable2(row.零件图号).then(response => {
+      getTable3(row.工艺计划流水号).then(response => {
         for (let k = 0; k < response.data.length; k++) {
           this.process[k] = response.data[k].工艺名称简称
           this.planDate[k] = response.data[k].计划日期_短
@@ -469,18 +469,18 @@ export default {
     },
     searchTable2(row) {
       if (this.a === 1) {
-        this.expands.push(row.零件图号)
+        this.expands.push(row.工艺计划流水号)
-        this.b = row.零件图号
+        this.b = row.工艺计划流水号
         this.a = 0
       } else {
-        if (this.b === row.零件图号) {
+        if (this.b === row.工艺计划流水号) {
           this.expands = []
           this.a = 1
         } else {
           this.expands = []
-          this.expands.push(row.零件图号)
+          this.expands.push(row.工艺计划流水号)
           this.a = 0
-          this.b = row.零件图号
+          this.b = row.工艺计划流水号
         }
       }
       this.process = []
@@ -489,7 +489,7 @@ export default {
       this.colorCode = []
       this.realDate = []
       this.tableData2 = []
-      getTable2(row.零件图号).then(response => {
+      getTable3(row.工艺计划流水号).then(response => {
         for (let k = 0; k < response.data.length; k++) {
           this.process[k] = response.data[k].工艺名称简称
           this.planDate[k] = response.data[k].计划日期_短

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -15,7 +15,7 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
             </el-option>
           </el-select>
-
+          <el-button size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="asd()">查询</el-button>
           <span>分组:</span>
           <el-select v-model="NumValue" size="small" style="margin-top:10px;width: 220px" filterable clearable placeholder="机床组号">
             <el-option
@@ -727,6 +727,7 @@ export default {
     this.getTable()
   },
   methods: {
+    asd() {},
     // TABLE每行颜色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex === 1) {
@@ -1442,7 +1443,6 @@ export default {
         this.bianliang1.push(this.tableData1[i].工艺计划流水号)
       }
       discharge(this.bianliang1).then(response => {
-        console.log(response.data)
         this.Selection1()
       })
     },