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

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -25,18 +25,6 @@ export function searchtable2(num1) {
     }
   })
 }
-// 更改打印状态
-export function edit(num1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_备料到货_状态更改',
-      param: '工艺计划流水号=' + num1
-    }
-  })
-}
 
 export function handlechange(Number, code) {
   return request({

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -52,7 +52,7 @@
         value-format="yyyy-MM-dd"
         style="top: 1px;"
         placeholder="选择开始日期"/>
-      <el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">制定零件计划</el-button>
+      <el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
       <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
       <el-table
         v-loading="listLoading"
@@ -1489,7 +1489,7 @@ export default {
         }
       }
     },
-    // 制定零件计划2.1
+    // 零件计划变更2.1
     PartPlan() {
       if (this.startTime !== '' && this.startTime !== null) {
         if (this.endTime !== '' && this.endTime !== null) {

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -273,7 +273,6 @@ export default {
           }
         }).then(() => {
           mainTable(this.num0).then(response => {
-            console.log(response.data)
             if (response.data.length === 0) {
               this.listLoading = false
             } else {

src/views/Outsourcing/InterBudgetaryBudgets/index.vue

@@ -40,7 +40,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading2" :data="tableData2" height="370" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
+      <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="370" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
         <el-table-column
           label=" "
           type="index"