发货管理、序间外协

src/utils/request.js

@@ -15,7 +15,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })

src/views/MarketingCenter/DeliveryManagement/index.vue

@@ -1046,6 +1046,7 @@ export default {
         this.form3.数量 = ''
         if (response.data[0].result === '1') {
           this.searchCargoBoxDetailed()
+          this.searchPackingListDetails()
           searchParts(this.code).then(response => {
             this.tableData4 = response.data
           })

src/views/Outsourcing/InterBudgetaryBudgets/index.vue

@@ -281,6 +281,7 @@ export default {
       this.tableData = []
       if (this.radio === 1) {
         searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
+          console.log(response.data)
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }).then(() => {

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -85,9 +85,16 @@
           type="index"
           align="center"
           width="50"/>
+        <el-table-column label="加工状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===4" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="序间外协" width="100" align="center">
           <template slot-scope="scope">
-            <el-checkbox v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
+            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
           </template>
         </el-table-column>
         <el-table-column label="外协状态" width="100" align="center">
@@ -235,6 +242,7 @@ export default {
       this.checkBox = []
       this.tableData2 = []
       searchTable2(row.工艺计划流水号).then(response => {
+        console.log(response.data)
         this.num1 = row.工艺计划流水号
         if (response.data.length === 0) {
           this.loading0 = false