diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index 8d45eb2c..23add9cb 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -222,8 +222,8 @@ export default {
         ProcessClassification: [{ required: true, message: '请输入工艺分类名称', trigger: 'blur' }]
       },
       rules2: {
-        Process: [{ required: true, message: '请输入工艺名称' }],
-        ProcessShort: [{ required: true, message: '请输入工艺名称简称' }]
+        Process: [{ required: true, message: '请输入工艺名称', trigger: 'blur' }],
+        ProcessShort: [{ required: true, message: '请输入工艺名称简称', trigger: 'blur' }]
       },
       rules3: {
         TechnologicalRequirements: [{ required: true, message: '请输入工艺要求', trigger: 'blur' }]
diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
index 63d20dc6..fe1f2ecf 100644
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -175,7 +175,7 @@ export default {
     this.fetchData()
   },
   methods: {
-    fetchData() { // 初始化未编制零件号、材料、公差
+    fetchData() { // 初始化未编制零件号
       getPerson().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.person.push({
@@ -255,49 +255,61 @@ export default {
       this.num0 = ''
       if (this.radio === 1) {
         detailInfo(this.partNumValue).then(response => {
-          this.typeValue = response.data[0].零件类型名称
-          this.partName = response.data[0].零件名称
-          this.batchNum = response.data[0].批次数量
-          this.num0 = response.data[0].工艺计划流水号
-          console.log(response.data[0].工艺计划流水号, 520)
-          this.material = response.data[0].材料
+          if (response.data.length !== 0) {
+            this.typeValue = response.data[0].零件类型名称
+            this.partName = response.data[0].零件名称
+            this.batchNum = response.data[0].批次数量
+            this.num0 = response.data[0].工艺计划流水号
+            this.material = response.data[0].材料
+          }
+        }).then(() => {
           mainTable(this.num0).then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              this.tableData.push({
-                name: response.data[i].工艺名称,
-                request: response.data[i].工艺要求,
-                num1: response.data[i].工序流水号,
-                Settlement: response.data[i].准结定额工时,
-                singleton: response.data[i].单件定额工时,
-                lingjian: response.data[i].零件图号,
-                numm: response.data[i].工艺计划流水号
-              })
+            if (response.data.length === 0) {
+              this.listLoading = false
+            } else {
+              for (let i = 0; i < response.data.length; i++) {
+                this.tableData.push({
+                  name: response.data[i].工艺名称,
+                  request: response.data[i].工艺要求,
+                  num1: response.data[i].工序流水号,
+                  Settlement: response.data[i].准结定额工时,
+                  singleton: response.data[i].单件定额工时,
+                  lingjian: response.data[i].零件图号,
+                  numm: response.data[i].工艺计划流水号
+                })
+              }
+              this.listLoading = false
             }
-            this.listLoading = false
           })
         })
       } else {
         detailInfo(this.partNumValue).then(response => {
-          this.typeValue = response.data[0].零件类型名称
-          this.partName = response.data[0].零件名称
-          this.batchNum = response.data[0].批次数量
-          this.num0 = response.data[0].工艺计划流水号
-          this.material = response.data[0].材料
-        })
-        mainTable1(this.partNumValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.tableData.push({
-              name: response.data[i].工艺名称,
-              request: response.data[i].工艺要求,
-              num1: response.data[i].工序流水号,
-              Settlement: response.data[i].准结定额工时,
-              singleton: response.data[i].单件定额工时,
-              budget: response.data[i].外协预算价格1,
-              lingjian: response.data[i].零件图号,
-              numm: response.data[i].工艺计划流水号
-            })
+          if (response.data.length !== 0) {
+            this.typeValue = response.data[0].零件类型名称
+            this.partName = response.data[0].零件名称
+            this.batchNum = response.data[0].批次数量
+            this.num0 = response.data[0].工艺计划流水号
+            this.material = response.data[0].材料
           }
-          this.listLoading = false
+        }).then(() => {
+          mainTable1(this.partNumValue).then(response => {
+            if (response.data.length === 0) {
+              this.listLoading = false
+            } else {
+              for (let i = 0; i < response.data.length; i++) {
+                this.tableData.push({
+                  name: response.data[i].工艺名称,
+                  request: response.data[i].工艺要求,
+                  num1: response.data[i].工序流水号,
+                  Settlement: response.data[i].准结定额工时,
+                  singleton: response.data[i].单件定额工时,
+                  budget: response.data[i].外协预算价格1,
+                  lingjian: response.data[i].零件图号,
+                  numm: response.data[i].工艺计划流水号
+                })
+              }
+            }
+          })
         })
       }
     },
diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue
index 6da8b560..b92cd5a1 100644
--- a/src/views/Outsourcing/PreorderAssociation/index.vue
+++ b/src/views/Outsourcing/PreorderAssociation/index.vue
@@ -97,10 +97,10 @@
             <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">
+        <el-table-column label="是否外协" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">外协</el-tag>
-            <el-tag v-else size="small">自制</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</el-tag>
+            <el-tag v-else size="small">否</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="工艺名称" align="center" width="220px">
@@ -242,7 +242,6 @@ 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