diff --git a/src/api/Inventory/MaterialReturn.js b/src/api/Inventory/MaterialReturn.js
index 9008b7b4..72567db0 100644
--- a/src/api/Inventory/MaterialReturn.js
+++ b/src/api/Inventory/MaterialReturn.js
@@ -59,7 +59,7 @@ export function searchRecord(check1, project, check2, machine, check3, group, ch
     }
   })
 }
-export function submitMaterialReturn(materialNumber, basicNumber, number, name, id) {
+export function submitMaterialReturn(materialNumber, basicNumber, number, name, id, type, floatNumber) {
   return request({
     url: '',
     method: 'post',
@@ -69,7 +69,7 @@ export function submitMaterialReturn(materialNumber, basicNumber, number, name,
       type: '2',
       // name: 'PDM_组件名称_查询数据',
       name: '采购管理_物料退货_增加数据',
-      param: '物料流水号=' + materialNumber + '&组件零件基本件流水号=' + basicNumber + '&数量=' + number + '&货位流水号=' + name + '&入库人员流水号=' + id
+      param: '物料流水号=' + materialNumber + '&组件零件基本件流水号=' + basicNumber + '&数量=' + number + '&货位流水号=' + name + '&入库人员流水号=' + id + '&退料类型=' + type + '&零件流水号=' + floatNumber
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
index 45f71679..b77b40aa 100644
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -98,3 +98,16 @@ export function returnEdit(num) {
     }
   })
 }
+export function tiaozheng(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '工艺制定_工艺定额查询_工序人员修改',
+      param: '人员编号=' + num1 + '&工艺计划流水号组=' + num2
+    }
+  })
+}
diff --git a/src/views/Inventory/MaterialReturn/index.vue b/src/views/Inventory/MaterialReturn/index.vue
index 6c694c71..79eda31c 100644
--- a/src/views/Inventory/MaterialReturn/index.vue
+++ b/src/views/Inventory/MaterialReturn/index.vue
@@ -79,19 +79,19 @@
             {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="退货" align="center" width="90" show-overflow-tooltip>
+        <el-table-column label="退料" align="center" width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
+            {{ scope.row.退料数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="退货人" align="center" width="100" show-overflow-tooltip>
+        <el-table-column label="退料人" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.领料人 }}
+            {{ scope.row.退料人 }}
           </template>
         </el-table-column>
-        <el-table-column label="退货时间" align="center" width="90">
+        <el-table-column label="退料时间" align="center" width="90">
           <template slot-scope="scope">
-            {{ scope.row.出库时间 ? scope.row.出库时间.split(' ')[0] : '-' }}
+            {{ scope.row.退料时间 ? scope.row.退料时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
@@ -162,6 +162,8 @@ export default {
       name: '',
       spec: '',
       model: '',
+      typeNumber: '',
+      floatNumber: '',
       locateName: [],
       tableData: [],
       pageSize1: 100,
@@ -243,10 +245,12 @@ export default {
       this.dialogFormVisible = true
       this.materialNumber = row.物料流水号
       this.basicNumber = row.组件零件基本件流水号
-      this.outNumber = row.出库数量
+      this.outNumber = Number(row.出库数量)
+      this.typeNumber = row.退料类型
+      this.floatNumber = row.零件流水号
     },
     submit() {
-      submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id).then(response => {
+      submitMaterialReturn(this.materialNumber, this.basicNumber, this.form.退料数量, this.form.货位名称, this.id, this.typeNumber, this.floatNumber).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('退料成功')
           this.dialogFormVisible = false
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 8ad016dd..21d36b0f 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <div>
         <el-row>
-          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 10px;width:150px" clearable @change="machineChange">
+          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin:0px 5px;width:150px" clearable @change="machineChange">
             <el-option
               v-for="item in machineNumber"
               :key="item.value"
@@ -13,15 +13,15 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
             </el-option>
           </el-select>
-          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 10px;width:100px" size="small" clearable>
+          <el-select v-model="groupNumberValue" placeholder="组号" style="margin:0px 5px;width:100px" size="small" clearable>
             <el-option
               v-for="item in groupNumber"
               :key="item.value"
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 10px;width:150px"/>
-          <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 10px;width:150px" clearable >
+          <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 250px; margin:0px 5px;width:150px"/>
+          <el-select v-model="personValue" placeholder="工艺员" size="small" style="margin:0px 5px;width:150px" clearable >
             <el-option
               v-for="item in person"
               :key="item.value"
@@ -36,13 +36,21 @@
             value-format="yyyy-MM-dd"
             format="yyyy-MM-dd"
             range-separator="～"
-            style="width:250px;margin-left: 10px"
+            style="width:250px;margin-left: 5px"
             start-placeholder="开始日期"
             end-placeholder="结束日期"/>
-          <el-button type="primary" size="small" style="margin: 0px 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
+          <el-button type="primary" size="small" style="margin: 0px 5px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
           <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
-            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
+            <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 0px" icon="el-icon-back" size="small" @click="returnEdit">打回重新编制</el-button>
           </el-tooltip>
+          <el-button :disabled="jinyong" type="primary" size="small" plain style="float: right; margin: 0px 20px 0px 0px" @click="tiaozheng()">工艺员调整</el-button>
+          <el-select v-model="PersonValue1" style="width:100px;float: right;" placeholder="人员" size="small" filterable clearable>
+            <el-option
+              v-for="item in Person1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </el-row>
       </div>
     </el-card>
@@ -189,7 +197,7 @@
 </template>
 
 <script>
-import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
+import { initMachineProject, searchgroup, initPerson, search, searchtable1, returnEdit, tiaozheng } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
 
 export default {
   data() {
@@ -221,7 +229,10 @@ export default {
       原材料规格: '',
       工艺员: '',
       定额员: '',
-      日期: ''
+      日期: '',
+      PersonValue1: '',
+      Person1: [],
+      jinyong: false
     }
   },
   created() {
@@ -229,6 +240,24 @@ export default {
     // this.searchData()
   },
   methods: {
+    tiaozheng() {
+      if (this.partNumValue.length !== 0) {
+        if (this.PersonValue1) {
+          tiaozheng(this.PersonValue1, this.partNumValue).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('调整成功')
+              this.searchData()
+            } else {
+              this.$message.warning('调整失败')
+            }
+          })
+        } else {
+          this.$message.warning('请选择人员')
+        }
+      } else {
+        this.$message.warning('请选择物料')
+      }
+    },
     returnEdit() { // 在制零件工艺修改
       if (this.partNumValue.length === 0) {
         this.$message.error('请选择零件')
@@ -272,6 +301,10 @@ export default {
             label: response.data[i].姓名,
             value: response.data[i].人员编号
           })
+          this.Person1.push({
+            value: response.data[i].人员编号,
+            label: response.data[i].姓名
+          })
         }
       })
     },
@@ -317,9 +350,13 @@ export default {
       })
     },
     handleSelectionChange(val) {
+      this.jinyong = false
       this.partNumValue = []
       for (let i = 0; i < val.length; i++) {
         this.partNumValue.push(val[i].工艺计划流水号)
+        if (val[i].工艺任务分配状态 === 1) {
+          this.jinyong = true
+        }
       }
     },
     handleSizeChange(val) {