更新

src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js

@@ -53,8 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
-      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }

src/api/ManufacturingCenter/ProcessPlanningNew.js

@@ -400,7 +400,7 @@ export function deleteOne(num0, num1) {
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '2',
+      type: '1',
       name: '车间生产管理工艺_零件工序_删除数据_工序流水号',
       param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int'
     }

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -47,7 +47,7 @@
       </div>
     </el-card>
     <el-row>
-      <el-col style="width: 750px">
+      <el-col style="width: 700px">
         <el-card>
           <el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click">
             <el-table-column type="selection" align="center" width="50"/>
@@ -81,7 +81,7 @@
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="工艺员" prop="工艺员" align="center" width="67px">
+            <el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.工艺员 }}
               </template>
@@ -115,7 +115,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 1000px">
+      <el-col style="width: 680px">
         <el-card v-if="tableData2.length">
           <table class="tg">
             <tr>
@@ -296,7 +296,7 @@ export default {
       this.personValue ? check4 = 1 : check4 = 0
       this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
       search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
-        this.tableData = response.data.rows
+        this.tableData = response.data.result
         this.tableData.map(v => {
           this.$set(v)
           if (v.工艺员 === '超级管理员') {
@@ -304,7 +304,7 @@ export default {
           }
           return v
         })
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
     },

src/views/ManufacturingCenter/ProcessPlanningNew/index.vue

@@ -400,13 +400,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="零件图号">
-              <el-select
-                v-model="tuhaoValue"
-                placeholder="零件图号"
-                size="small"
-                filterable
-                style="width:150px"
-                @change="numChange1()">
+              <el-select v-model="tuhaoValue" placeholder="零件图号" size="small" filterable style="width:150px" @change="numChange1()">
                 <el-option
                   v-for="item in tuhao"
                   :key="item.value"
@@ -1572,8 +1566,12 @@ export default {
       if (this.partNumValue === '') {
         this.$message.error('请先选择一个零件')
       } else {
-        deleteOne(this.partNumValue, row.工序流水号).then(() => {
+        deleteOne(this.partNumValue, row.工序流水号).then(response => {
+          if (response.data[0].结果 === '成功') {
             this.searchDetail()
+          } else {
+            this.$message.error('此工序已加工，无法删除')
+          }
         })
       }
     },

src/views/ManufacturingCenter/ShopScheduling/index.vue

@@ -226,7 +226,7 @@ export default {
       if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) {
         XuanRu(this.PersonValue, row.工序流水号).then(response => {
           if (response.data[0].result === '1') {
-            this.tableData1[this.index].状态 = '1'
+            this.tableData1[this.index].状态 = 1
             this.loading3 = true
             this.tableData3 = []
             getGongxu(this.工艺计划流水号).then(response => {