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

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -121,7 +121,8 @@ export default {
       'sidebar',
       'avatar',
       'name',
-      'id'
+      'id',
+      'userId'
     ])
   },
   created() {

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -1481,7 +1481,7 @@ export default {
       if (this.checked === true) {
         let 零件图号
         let flag = 0
-        for (let i = 0; i < 30; i++) {
+        for (let i = 0; i < this.tableData.length; i++) {
           saveApprove(this.tableData[i].工艺计划流水号, this.tableData[i].工艺编号, this.tableData[i].工艺要求, this.spec, this.tableData[i].工序顺序, this.tableData[i].工序间是否外协, this.tableData[i].工序流水号, this.material, '', '', this.CraftmenValue, this.tableData[i].工艺难度等级).then(() => {
             for (let j = 0; j < this.partNum.length; j++) {
               if (this.partNum[j].value === this.partNumValue) {
@@ -1490,7 +1490,7 @@ export default {
             }
             TableAddLi(this.tableData[i].单件定额工时, this.tableData[i].准结定额工时, 零件图号, this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号).then(() => {
               flag++
-              if (flag === 30) {
+              if (flag === this.tableData.length) {
                 TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => {
                   this.checked = false
                   this.partNumValue = ''