更新

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -50,7 +50,12 @@
         height="550"
         border
         highlight-current-row
+        @selection-change="handleSelectionChange"
         @row-click="click">
+        <el-table-column
+          type="selection"
+          align="center"
+          width="55"/>
         <el-table-column label="机床号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
@@ -175,7 +180,7 @@ import { initMachineProject, searchgroup, initPerson, search, searchtable1,
 export default {
   data() {
     return {
-      partNumValue: '',
+      partNumValue: [],
       machineNumberValue: '',
       machineNumber: [],
       groupNumberValue: '',
@@ -208,10 +213,10 @@ export default {
   },
   methods: {
     returnEdit() { // 在制零件工艺修改
-      if (this.partNumValue === '' || this.partNumValue === null) {
+      if (this.partNumValue.length === 0) {
         this.$message.error('请选择零件')
       } else {
-        this.$confirm(`此操作会将 ${this.零件图号} 打回至未编制状态, 是否继续?`, '提示', {
+        this.$confirm(`此操作会将零件打回至未编制状态, 是否继续?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
@@ -219,8 +224,8 @@ export default {
           returnEdit(this.partNumValue).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('打回成功')
-              this.partNumValue = ''
-              this.tableData = []
+              this.partNumValue = []
+              this.searchData()
               this.tableData2 = []
             } else {
               this.$message.error('打回失败')
@@ -279,12 +284,17 @@ export default {
       })
     },
     click(row) {
-      this.partNumValue = row.工艺计划流水号
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {
         this.tableData2 = response.data
       })
     },
+    handleSelectionChange(val) {
+      this.partNumValue = []
+      for (let i = 0; i < val.length; i++) {
+        this.partNumValue.push(val[i].工艺计划流水号)
+      }
+    },
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -32,7 +32,7 @@
           <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
         </el-option>
       </el-select>
-      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
+      <el-checkbox v-model="checked" :disabled="isShow2 || (token !== '6' && token !== '19')" size="small" style="margin:10px">是否核准</el-checkbox>
       <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
       <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
       <div v-show="isShow">
@@ -695,7 +695,8 @@ export default {
   computed: {
     ...mapGetters([
       'name',
-      'id'
+      'id',
+      'token'
     ])
   },
   mounted() {
@@ -1064,6 +1065,7 @@ export default {
       })
     },
     initPerson() { // 初始化工艺员
+      console.log(this.token, 12334)
       initPerson().then(response => {
         this.tableData3 = response.data
       })