人员管理拉取

src/api/system/user.js

@@ -125,3 +125,12 @@ export function updateAuthRole(data) {
     params: data
   })
 }
+
+
+// 同步bpm人员数据
+export function getBpmUser() {
+  return request({
+    url: '/system/usermanage/userManageCreate',
+    method: 'post',
+  })
+}

src/views/mes/pro/productionSolution/components/ProcessProd.vue

@@ -134,8 +134,8 @@
         <el-form-item label="主副单位转换比例">
           <el-input type="number" v-model="form.unitConvert"></el-input>
         </el-form-item>
-        <el-form-item label="反冲">
-          <el-input v-model="form.idx"></el-input>
+        <el-form-item label="是否反冲">
+          <el-input v-model="form.recoil"></el-input>
         </el-form-item>
         <el-form-item label="备注">
           <el-input v-model="form.remark" type="textarea" :rows="3"></el-input>

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -5,7 +5,7 @@
       <el-table-column label="工序名称" prop="processName" align="center" />
       <el-table-column label="工作中心" prop="workstationName" align="center" />
       <el-table-column label="标准工时" prop="stdWorkingTime" align="center" />
-      <el-table-column label="换行时间" prop="lineBreakTime" align="center" />
+      <el-table-column label="换形时间" prop="lineBreakTime" align="center" />
       <el-table-column
         label="工时单位"
         prop="stdWorkingTimeUom"

src/views/mes/pro/request/components/arangeSelect.vue

 <template>
-    <el-dialog title="生产任务选择"
+    <el-dialog title="编排单号"
       v-if="showFlag"
       :visible.sync="showFlag"
       :modal= false
@@ -35,10 +35,9 @@
               <el-radio v-model="selectedTaskId" :label="scope.row.taskCode + scope.row.arrangeCode" @change="handleRowChange(scope.row)">{{""}}</el-radio>
             </template>
           </el-table-column>
-          <el-table-column label="任务编号" align="center"  prop="taskCode" :show-overflow-tooltip="true"/>
           <el-table-column label="编排单号" align="center"  prop="arrangeCode" :show-overflow-tooltip="true"/>
-          <el-table-column label="工作中心编号" align="center"  prop="workstationCode" :show-overflow-tooltip="true"/>
-          <el-table-column label="工作中心名称" align="center"  prop="workstationName" :show-overflow-tooltip="true"/>
+          <el-table-column label="生产工单" align="center"  prop="workorderCode" :show-overflow-tooltip="true"/>
+          <el-table-column label="分组号" align="center"  prop="groupCode" :show-overflow-tooltip="true"/>
       
           <el-table-column v-if="btnShow" label="操作" align="center" width="100px" class-name="small-padding fixed-width">
             <template slot-scope="scope">

src/views/system/user/index.vue

@@ -131,6 +131,16 @@
               v-hasPermi="['system:user:export']"
             >导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              :loading="syncLoading"
+              type="primary"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="handleSynchronism"
+              v-hasPermi="['mes:md:mditem:edit']"
+            >同步</el-button>
+          </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
@@ -340,7 +350,7 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, getBpmUser} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -376,6 +386,8 @@ export default {
       deptName: undefined,
       // 默认密码
       initPassword: undefined,
+
+      syncLoading: false,
       // 日期范围
       dateRange: [],
       // 岗位选项
@@ -481,6 +493,18 @@ export default {
       treeselect().then(response => {
         this.deptOptions = response.data;
       });
+    },
+      /** 同步bpm人员管理 */
+      handleSynchronism() {
+      this.syncLoading = true;
+      this.reset();
+      getBpmUser().then(res => {
+        if(res.code === 200) {
+          this.$modal.msgSuccess("同步成功");
+         this.getList();
+        }
+        this.syncLoading = false;
+      });
     },
     // 筛选节点
     filterNode(value, data) {