问题清单

src/api/system/user.js

@@ -161,6 +161,25 @@ export function addWorkunituser(data) {
   })
 }
 
+// 查询权限复制
+export function checkCopyAllByUserId(data) {
+  return request({
+    url: '/system/user/checkCopyAllByUserId',
+    method: 'post',
+    data: data,
+    nomsg: true
+  })
+}
+
+// 权限复制
+export function copyAllByUserId(data) {
+  return request({
+    url: '/system/user/copyAllByUserId',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改人工作单元
 export function updateWorkunituser(data) {
   return request({

src/components/userSelect/single.vue

@@ -2,7 +2,7 @@
   <el-dialog :title="$t('人员选择')"
     v-if="showFlag"
     :visible.sync="showFlag"
-    :modal= false
+    :modal= showModal
     width="80%"
     center
   >
@@ -112,6 +112,11 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "UserSingleSelect",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
+  props: {
+    showModal: {
+      default: false
+    }
+  },
   components: { Treeselect },
   data() {
     return {

src/i18n/lang/th_TH.json

@@ -2993,5 +2993,7 @@
 	"排程日期": "วันที ่ กําหนดการ",
 	"该工序已添加，请勿重复添加": "มีการเพิ่มขั้นตอนห้ามเพิ่มซ้ำ",
 	"所属产线": "สายการผลิต",
-	"打印次数必须是整数": "จำนวนการพิมพ์ต้องเป็นจำนวนเต็ม"
+	"打印次数必须是整数": "จำนวนการพิมพ์ต้องเป็นจำนวนเต็ม",
+	"工序流向名称": "ชื่อการไหลของกระบวนการ",
+	"工序流向编码": "การเข้ารหัสการไหลของกระบวนการ"
 }

src/i18n/lang/zh_CN.json

@@ -2993,5 +2993,10 @@
     "排程日期": "排程日期",
 	"该工序已添加，请勿重复添加": "该工序已添加，请勿重复添加",
 	"所属产线": "所属产线",
-	"打印次数必须是整数": "打印次数必须是整数"
+	"打印次数必须是整数": "打印次数必须是整数",
+	"工序流向名称": "工序流向名称",
+	"工序流向编码": "工序流向编码",
+	"修改人": "修改人",
+	"修改时间": "修改时间",
+	"权限复制": "权限复制"
 }

src/utils/request.js

@@ -94,6 +94,8 @@ service.interceptors.response.use(res => {
     }
       return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
     } else if (code === 500) {
+      console.log('res', res)
+      if (res.request.responseURL.indexOf('checkCopyAllByUserId') > -1) return Promise.reject(msg)
       Message({
         message: msg,
         type: 'error'

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

@@ -76,7 +76,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column :label="$t('工序流向')" prop="directionProcessId" align="center" width="160">
+      <el-table-column :label="$t('工序流向名称')" prop="directionProcessId" align="center" width="160">
         <template slot-scope="scope">
           <el-select v-model="scope.row.directionProcessId" filterable :disabled="mode == 'info'"
           @change="(v) => choosedirectionProcess(v, scope.row, scope.$index)">
@@ -89,6 +89,19 @@
           </el-select>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('工序流向编码')" prop="directionProcessId" align="center" width="160">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.directionProcessId" filterable :disabled="mode == 'info'"
+          @change="(v) => choosedirectionProcess(v, scope.row, scope.$index)">
+            <el-option
+              v-for="item in processOptions"
+              :key="item.processId"
+              :label="item.processCode"
+              :value="item.processId"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('common.workstation_code')" prop="workstationCode" align="center" width="130">
         <template slot-scope="scope">
           <el-select v-model="scope.row.workstationId" :disabled="mode == 'info'" filterable @change="(v) => chooseworkstationName(v, scope.row, scope.$index)">

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -28,6 +28,10 @@
       <el-table-column :label="$t('产品版本名称')" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
       <el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
+      <el-table-column :label="$t('创建人')" align="center" prop="createBy" />
+      <el-table-column :label="$t('创建时间')" align="center" prop="createTime" />
+      <el-table-column :label="$t('修改人')" align="center" prop="updateBy" />
+      <el-table-column :label="$t('修改时间')" align="center" prop="updateTime" />
       <el-table-column :label="$t('common.remark')" align="center" prop="remark" />
       <!-- <el-table-column :label="$t('common.status')" align="center" width="100" prop="status">
         <template slot-scope="scope">

src/views/system/user/index.vue

@@ -131,6 +131,16 @@
               v-hasPermi="['system:user:export']"
             >{{ $t('common.export') }}</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              size="mini"
+              :disabled="multiple"
+              @click="handleCopy"
+              v-hasPermi="['system:user:copy']"
+            >{{ $t('权限复制') }}</el-button>
+          </el-col>
           <el-col :span="1.5">
             <el-button
               :loading="syncLoading"
@@ -365,13 +375,15 @@
         <el-button @click="upload.open = false">{{ $t('common.cancel') }}</el-button>
       </div>
     </el-dialog>
+    <UserSingleSelect ref="userSelect" showModal @onSelected="onUserSelected"></UserSingleSelect>
+
   </div>
 </template>
 
 <script>
 
-
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, getBpmUser} from "@/api/system/user";
+import UserSingleSelect from "@/components/userSelect/single.vue"
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, getBpmUser, checkCopyAllByUserId, copyAllByUserId} from "@/api/system/user";
 import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -380,7 +392,7 @@ import Workstationworker from "./profile/worker";
 export default {
   name: "User",
   dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect, Workstationworker },
+  components: { Treeselect, Workstationworker, UserSingleSelect },
   data() {
     return {
       // 遮罩层
@@ -501,6 +513,34 @@ export default {
     });
   },
   methods: {
+    handleCopy(){
+      this.$refs.userSelect.showFlag = true;
+    },
+    onUserSelected(row){
+      const params = {
+        copiedUserId: row.userId,
+        userIds: this.ids
+      }
+      checkCopyAllByUserId(params).then(res => {
+        if(res.code === 200 ) {
+          copyAllByUserId(params).then(res=>{
+            if(res.code === 200) {
+              this.$modal.msgSuccess(this.$t('复制成功'));
+              this.getList()
+            }
+          })
+        }
+      }).catch(res=>{
+        if (res) {
+          this.$modal.confirm(res).then(function() {
+          return copyAllByUserId(params);
+          }).then(() => {
+            this.$modal.msgSuccess(this.$t('复制成功'));
+          })
+        }
+      })
+      
+    },
     handlePostAdd() {
       this.$refs.postList.handleAdd();
     },