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

src/api/ManufacturingCenter/ProcessTaskAssignment.js

@@ -122,14 +122,14 @@ export function save(num1, num2, num3) {
   })
 }
 // 保存
-export function save2(num1, num2, num3) {
+export function save2(num1, num2, num3, num4) {
   return request({
     url: '',
     method: 'post',
     data: {
-      type: '2',
+      type: '1',
-      name: '车间生产管理工艺_工艺任务分配_保存数据',
+      name: '车间生产管理工艺_工艺任务分配_通用件自动编制工艺_循环执行',
-      param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3
+      param: '工艺计划流水号组=' + num1 + '&零件图号组=' + num2 + '&规格组=' + num3 + '&工艺员流水号组=' + num4
     }
   })
 }

src/utils/request.js

@@ -26,7 +26,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -24,7 +24,7 @@
       </el-select>
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
-      <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="currency">保存</el-button>
+      <!--<el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" @click="currency">通用件保存</el-button>-->
     </el-card>
     <el-card>
       <el-table
@@ -133,7 +133,7 @@
 </template>
 
 <script>
-import { getProject0, getProject, getGraphNum, getGroupNum, getTable0, getGraphNum0, getGroupNum0, getTable00, save, initPerson } from '@/api/ManufacturingCenter/ProcessTaskAssignment'
+import { getProject0, getProject, getGraphNum, getGroupNum, getTable0, getGraphNum0, getGroupNum0, getTable00, save, initPerson, save2 } from '@/api/ManufacturingCenter/ProcessTaskAssignment'
 
 export default {
   data() {
@@ -161,6 +161,7 @@ export default {
       PageSize: 50,
       total: 0,
       Craftsmens: [], // 工艺员
+      工艺计划流水号组: [],
       通用件图号: [],
       通用件规格: [],
       工艺员: []
@@ -224,6 +225,8 @@ export default {
       }
     },
     getGraphNum() { // 获取下拉图号
+      this.graphNumValue = ''
+      this.graphNum = []
       this.tableData = []
       this.total = 0
       this.GroupNumValue = ''
@@ -383,19 +386,35 @@ export default {
     },
     // 直接保存工艺
     currency() {
+      this.工艺计划流水号组 = []
       this.通用件图号 = []
       this.通用件规格 = []
       this.工艺员 = []
+      var check = 1
       this.multipleSelection.map(v => {
         if (!v.工艺员) {
-          return false
+          check = 0
         }
-        console.log(111)
+        this.工艺计划流水号组.push(v.工艺计划流水号)
         this.通用件图号.push(v.零件号)
         this.通用件规格.push(v.规格)
         this.工艺员.push(v.工艺员)
       })
-      console.log(this.通用件图号, this.通用件规格, this.工艺员)
+      if (check === 1) {
+        console.log(this.工艺计划流水号组, this.通用件图号, this.通用件规格, this.工艺员)
+        save2(this.工艺计划流水号组, this.通用件图号, this.通用件规格, this.工艺员).then(response => {
+          console.log(response.data, 231)
+          if (response.data[0].结果 === 'success') {
+            this.$message.success('保存成功')
+            this.PageCurrent = 1
+            this.getTable()
+          } else {
+            this.$message.error('请选择工艺员')
+          }
+        })
+      } else {
+        this.$message.error('请选择工艺员')
+      }
     }
   }
 }