Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/api/system/unifiedPortal/index.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request';
+
+// 保存
+export async function saveInfo(data) {
+  const res = await request.post('/sys/system/save', data);
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 修改
+export async function updateInfo(data) {
+  const res = await request.put(`/sys/system/update`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 详情
+export async function getDetails(id) {
+  const res = await request.get(`/sys/system/getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 列表
+export async function getList(params) {
+  const res = await request.get(`/sys/system/page`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 删除
+export async function deleteInfo(data) {
+  const res = await request.delete(`/sys/system/delete`, { data });
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/enum/dict.js

@@ -60,7 +60,9 @@ export default {
   包装强度: 'packagingStrength',
   包装密度: 'packagingDensity',
   编码间隔符: 'codeSpaceMark',
-  条码分类: 'strip_type'
+  条码分类: 'strip_type',
+  链接分类: 'link_type',
+  架构分类: 'archit_type'
 };
 
 export const numberList = [

src/store/getters.js

@@ -16,10 +16,10 @@ export default {
     const obj = (state.dict[dictEnum[enumName]] || []).find((item) => {
       return item.dictCode == dictCode;
     });
-    console.log(dictEnum)
-    console.log(enumName)
-    console.log( state.dict)
-   
+    console.log(dictEnum);
+    console.log(enumName);
+    console.log(state.dict);
+
     return obj && obj.dictValue;
   }
 };

src/utils/request.js

@@ -3,7 +3,7 @@
  */
 import axios from 'axios';
 import router from '@/router';
-import store from '@/store';
+
 import { MessageBox, Message } from 'element-ui';
 import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
 import { getToken, setToken } from './token-util';

src/views/bpm/model/index.vue

@@ -46,7 +46,7 @@
     </el-card>
 
     <!-- 对话框(添加 / 修改) -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="流程分类" prop="processTypeId">
           <!--          <el-select v-model="form.processTypeId" clearable style="width: 100%" @change="handleProcessType">-->

src/views/codeManagement/components/code-list.vue

@@ -99,6 +99,16 @@ export default {
           minWidth: 200,
           showOverflowTooltip: true
         },
+
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'left',
+          sortable: 'custom',
+          width: 160,
+          showOverflowTooltip: true
+        },
+
         {
           columnKey: 'action',
           label: '操作',

src/views/material/BOMmanage/components/bomTreeDialog.vue

@@ -287,7 +287,7 @@
         }
       },
 
-      async open(type, versions, categoryId, treeId) {
+      async open(type, versions, categoryId, treeId, isTemp) {
         this.attributeData = {};
         this.attributeData.bomType = type;
       
@@ -297,7 +297,8 @@
         const res = await getBomTreeList({
           categoryId,
           versions,
-          bomType: type
+          bomType: type,
+          isTemp
         });
 
         this.bomTreeList = res.data;

src/views/material/BOMmanage/components/detailedList.vue

@@ -256,7 +256,7 @@
         ],
         statusOpt: {
           '': '全部',
-          0: '已停用',
+          0: '草稿',
           1: '已发布'
         },
 
@@ -283,6 +283,11 @@
       treeId: {
         type: String,
         default: ''
+      },
+
+      isTemp: {
+         type: Number,
+         default: 0
       }
     },
 
@@ -353,7 +358,8 @@
           this.attributeData.bomType,
           this.attributeData.versions,
           this.attributeData.categoryId,
-          this.newTreeId
+          this.newTreeId,
+          this.isTemp
         );
       },
 

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -1013,6 +1013,12 @@
             label: '型号',
             prop: 'modelType'
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true
+          },
           {
             label: '数量',
             slot: 'count',
@@ -1407,27 +1413,11 @@
         this.tableData.taskParam[this.currentIndex][type].splice(index, 1);
       },
       addProductList(list) {
-        console.log(list);
+        console.log(list, 8888);
         let subCode = 0;
         let array = [];
         list.map((item, index) => {
-          // let max = '';
-          // if (
-          //   this.tableData.taskParam[this.currentIndex]['materialQuota']
-          //     .length > 0
-          // ) {
-          //   max = Number(
-          //     Math.max(
-          //       ...this.tableData.taskParam[this.currentIndex][
-          //         'materialQuota'
-          //       ].map((i) => i.subCode)
-          //     )
-          //   );
-          //   subCode = max + index + 1;
-          // } else {
-          //   max = 1;
-          //   subCode = max + index;
-          // }
+ 
           let max = '';
           if (
             this.tableData.taskParam[this.currentIndex]['materialQuota']
@@ -1451,26 +1441,36 @@
               max = new Array(4 - max.length).fill('0').join('') + max;
             }
           }
+
+
+
+
           subCode = max.substring(0, max.length - 1) + '0';
           array.push({
             subCode,
-            categoryId: item.categoryId,
+            id: item.id,
             categoryName: item.name,
             categoryCode: item.categoryCode,
             isReworkBom: 0,
             brandNum: item.brandNum,
-            weightUnit: item.weightUnit,
             count: '',
             modelType: item.modelType,
-            unit: item.measuringUnit
+            unit: item.measuringUnit,
+            bomArtFiles: [],
+            remark: '',
+            specification: item.specification,
+            rootCategoryLevelId: item.categoryLevelPathIdParent,
+            extInfo:item.extInfo,
+     
+
           });
         });
-        console.log(array);
+  
         this.tableData.taskParam[this.currentIndex].materialQuota =
           this.tableData.taskParam[this.currentIndex].materialQuota.concat(
             array
           );
-        console.log(this.tableData.taskParam[this.currentIndex].materialQuota);
+     
         this.$refs.materialTable.setData(
           this.tableData.taskParam[this.currentIndex].materialQuota
         );

src/views/material/BOMmanage/detailsPop.vue

@@ -256,6 +256,7 @@
               >
                 <detailedList
                   v-if="activeName == '明细表'"
+                  :isTemp="searchObj.isTemp"
                   :attributeData="currentNodeData"
                   :treeId="treeId"
                 ></detailedList>
@@ -277,7 +278,7 @@
                 label="工序配置"
                 name="工序配置"
                 v-if="
-                  currentNodeData.bomType != 4 &&
+                  currentNodeData.bomType != 4 && currentNodeData.bomType != 1  &&
                   (searchObj.isProduct ||
                     [1, 9].includes(searchObj.rootPathIdParent))
                 "
@@ -478,8 +479,8 @@
             categoryId: this.searchObj.categoryId,
             versions: this.searchObj.versions,
             bomType: this.currentNodeData.bomType,
-            isTemp: this.searchObj.isTemp
-          });
+            isTemp: this.searchObj.isTemp  || 0
+           });
           this.treeLoading = false;
           if (res?.code === '0') {
             if (res.data?.length > 0) {
@@ -526,7 +527,7 @@
         let param = {
           categoryId: this.searchObj.categoryId,
           bomType: this.currentNodeData.bomType,
-          isTemp: this.searchObj.isTemp
+          isTemp: this.searchObj.isTemp || 0
         };
         versionList(param).then((res) => {
           this.versList = res || [];
@@ -636,7 +637,7 @@
           })
             .then(() => {
               bomSubmit({ businessId: this.currentNodeData.id }).then((res) => {
-                if (res.code == 0) {
+                if (res?.code == 0) {
                   this.$message.success('发布成功');
                   this.getTreeData();
                 }

src/views/material/product/components/index-data.vue

@@ -134,14 +134,14 @@
           结构BOM
         </el-link>
 
-        <el-link
+        <!-- <el-link
           type="primary"
           v-if="row.isProduct == 1"
           :underline="false"
           @click="openMaterial(row)"
         >
           物料BOM
-        </el-link>
+        </el-link> -->
 
         <!-- <el-link
           type="primary"

src/views/system/role/index.vue

@@ -20,6 +20,7 @@
             icon="el-icon-plus"
             class="ele-btn-icon"
             @click="openEdit()"
+            v-if="$hasPermission('sys:role:add')"
           >
             添加
           </el-button>
@@ -29,6 +30,7 @@
             icon="el-icon-delete"
             class="ele-btn-icon"
             @click="removeBatch"
+            v-if="$hasPermission('sys:role:delete')"
           >
             删除
           </el-button>
@@ -54,6 +56,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             修改
           </el-link>
@@ -62,6 +65,7 @@
             :underline="false"
             icon="el-icon-finished"
             @click="openAuth(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             分配权限
           </el-link>
@@ -70,6 +74,7 @@
             :underline="false"
             icon="el-icon-finished"
             @click="openDataAuth(row)"
+            v-if="$hasPermission('sys:role:update')"
           >
             数据权限
           </el-link>
@@ -79,7 +84,7 @@
             @confirm="remove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
+              <el-link type="danger"  v-if="$hasPermission('sys:role:delete')" :underline="false" icon="el-icon-delete">
                 删除
               </el-link>
             </template>

src/views/system/unifiedPortal/dialog.vue

@@ -0,0 +1,203 @@
+<template>
+  <el-dialog
+    :title="`${type}统一门户`"
+    :visible.sync="dialogVisible"
+    width="20%"
+  >
+    <el-form label-width="80px" class="zw-criterion">
+      <el-form-item label="图片">
+        <el-upload
+          class="avatar-uploader"
+          :action="''"
+          :auto-upload="false"
+          :show-file-list="false"
+          :on-change="handleAvatarChangeIcon"
+        >
+          <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="名称" required>
+        <el-input v-model="form.name" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="排序" required>
+        <el-input
+          v-model="form.sort"
+          type="number"
+          placeholder="请输入内容"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="链接" required>
+        <el-input v-model="form.linkUrl" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="链接类型" required>
+        <DictSelection
+          dictName="链接分类"
+          :disabled="false"
+          v-model="form.linkType"
+        ></DictSelection>
+      </el-form-item>
+      <el-form-item label="架构类型" required>
+        <DictSelection
+          dictName="架构分类"
+          :disabled="false"
+          v-model="form.architType"
+        ></DictSelection>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input v-model="form.remark" placeholder="请输入内容"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button size="small" @click="dialogVisible = false">关 闭</el-button>
+      <el-button size="small" @click="config" type="primary">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import { uploadFile } from '@/api/system/file/index.js';
+  import { getImageUrl } from '@/utils/file';
+  import {
+    saveInfo,
+    updateInfo,
+    getDetails
+  } from '@/api/system/unifiedPortal/index.js';
+  export default {
+    data() {
+      return {
+        dialogVisible: false,
+        file: null,
+        type: '新增',
+        form: {},
+        imageUrl: '',
+        options: [
+          {
+            label: '程序应用',
+            value: '1'
+          },
+          {
+            label: '网页应用',
+            value: '2'
+          }
+        ]
+      };
+    },
+    methods: {
+      handleClose() {
+        this.dialogVisible = false;
+      },
+      async open(type, id) {
+        this.type = type;
+        if (type == '新增') {
+          this.form = {};
+          this.imageUrl = '';
+          this.file = null;
+        } else {
+          this.file = null;
+          this.form = await getDetails(id);
+          this.imageUrl = getImageUrl(this.form.iconPath);
+        }
+        this.dialogVisible = true;
+      },
+      handleAvatarChangeIcon(file, fileList) {
+        //选中文件触发的change事件
+        console.log(file);
+        const isJPG = file.raw.type === 'image/jpeg';
+        const isPNG = file.raw.type === 'image/png';
+        const isLt10M = file.raw.size / 1024 / 1024 < 10; //限制上传文件的大小
+        if (!isLt10M) {
+          this.$message.error('上传文件大小不能超过 10MB!');
+          return false;
+        }
+        if (!isPNG && !isJPG && !isLt2M) {
+          this.$message.error('上传图片只能是 JPG/PNG 格式!');
+          return false;
+        } else {
+          this.imageUrl = URL.createObjectURL(file.raw); //赋值图片的url，用于图片回显功能
+          this.file = file.raw; //赋值文件对象，用于上传操作
+        }
+      },
+      async config() {
+        if (!this.form.name) {
+          return this.$message.error('请输入名称');
+        }
+        if (this.form.sort < 0) {
+          return this.$message.error('请输入排序');
+        }
+        if (!this.form.linkUrl) {
+          return this.$message.error('请输入链接');
+        }
+        if (this.form.linkType < 0) {
+          return this.$message.error('请选择链接类型');
+        }
+        if (this.form.architType < 0) {
+          return this.$message.error('请选择架构类型');
+        }
+        // 文件上传操作
+        if (this.file) {
+          try {
+            let res = await uploadFile({
+              multiPartFile: this.file,
+              module: 'gateway'
+            });
+            this.form.icon = res.data.id;
+          } catch (error) {
+            console.log(error);
+            return this.$message.error('上传文件失败');
+          }
+        } else {
+          if (this.type == '新增') {
+            return this.$message.error('请上传图片');
+          }
+        }
+
+        if (this.type == '新增') {
+          // 保存数据
+          try {
+            await saveInfo(this.form);
+            this.$message.success('新增成功');
+            this.dialogVisible = false;
+            this.$emit('reload');
+          } catch (error) {
+            console.log(error);
+            this.$message.error('新增失败');
+          }
+        } else {
+          // 修改
+          try {
+            await updateInfo(this.form);
+            this.$message.success('修改成功');
+            this.dialogVisible = false;
+            this.$emit('reload');
+          } catch (error) {
+            this.$message.error('修改失败');
+          }
+        }
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .typeSelect {
+    width: 100%;
+  }
+  .avatar-uploader {
+    height: 120px;
+    width: 100%;
+  }
+  .avatar {
+    width: 120px;
+    height: 120px;
+    object-fit: cover;
+  }
+  .avatar-uploader-icon {
+    width: 120px;
+    height: 120px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px dashed #d9d9d9;
+  }
+</style>

src/views/system/unifiedPortal/index.vue

@@ -0,0 +1,213 @@
+<template>
+  <div id="unifiedPortalIndex">
+    <div class="content_box">
+      <el-card class="box-card">
+        <div class="control_bar">
+          <el-button type="primary" icon="el-icon-plus" @click="add"
+            >新增</el-button
+          >
+        </div>
+        <div class="list">
+          <div class="list_box">
+            <template v-for="(item, index) in list">
+              <div
+                :class="[
+                  (index + 1) % 6 == 0 ? 'list-item margin_0' : 'list-item'
+                ]"
+              >
+                <el-card>
+                  <div slot="header" class="clearfix">
+                    <span>{{ item.name }}</span>
+                    <i class="el-icon-delete" @click="deleted(item)"></i>
+                    <i class="el-icon-edit" @click="edit(item)"></i>
+                  </div>
+                  <div class="card-content">
+                    <el-image
+                      class="img"
+                      :src="item.img"
+                      fit="cover"
+                      :preview-src-list="[item.img]"
+                    >
+                    </el-image>
+                    <div class="item">
+                      <span>排序</span>
+                      <span>{{ item.sort }}</span>
+                    </div>
+                    <div class="item">
+                      <span>链接</span>
+                      <span>{{ item.linkUrl }}</span>
+                    </div>
+                    <div class="item">
+                      <span>链接类型</span>
+                      <span>{{ item.linkTypeName }}</span>
+                    </div>
+                    <div class="item">
+                      <span>架构类型</span>
+                      <span>{{ item.architTypeName }}</span>
+                    </div>
+                    <div class="item">
+                      <span>备注</span>
+                      <span>{{ item.remark }}</span>
+                    </div>
+                  </div>
+                </el-card>
+              </div>
+            </template>
+          </div>
+        </div>
+      </el-card>
+    </div>
+    <Dialog ref="dialogRef" @reload="getPages"></Dialog>
+  </div>
+</template>
+
+<script>
+  import dictMixins from '@/mixins/dictMixins';
+  import Dialog from './dialog.vue';
+  import { getList, deleteInfo } from '@/api/system/unifiedPortal/index.js';
+  import { getImageUrl } from '@/utils/file';
+  export default {
+    mixins: [dictMixins],
+    components: { Dialog },
+    data() {
+      return {
+        type: '新增',
+        list: []
+      };
+    },
+    created() {
+      this.getPages();
+      this.requestDict('链接分类');
+      this.requestDict('架构分类');
+    },
+    methods: {
+      async getPages() {
+        let data = await getList({ pageNum: 1, size: 9999 });
+        this.list = data.list.map((item) => {
+          return {
+            ...item,
+            architTypeName:
+              this.getDictValue('架构分类', String(item.architType)) || '',
+            linkTypeName:
+              this.getDictValue('链接分类', String(item.linkType)) || '',
+            img: getImageUrl(item.iconPath)
+          };
+        });
+        console.log(this.list);
+      },
+      add() {
+        this.type = '新增';
+        this.$refs.dialogRef.open(this.type);
+      },
+      edit(item) {
+        this.type = '编辑';
+        this.$refs.dialogRef.open(this.type, item.id);
+      },
+      deleted(item) {
+        this.$confirm('是否确认删除?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          try {
+            await deleteInfo([item.id]);
+            this.$message.success('删除成功');
+            await this.getPages();
+          } catch (error) {
+            console.log(error);
+            this.$message.error('删除失败');
+          }
+        });
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  #unifiedPortalIndex {
+    height: 100%;
+    width: 100%;
+    .content_box {
+      width: 100%;
+      height: 100%;
+      padding: 20px;
+      box-sizing: border-box;
+      :deep(.el-card) {
+        height: 100%;
+        width: 100%;
+        .el-card__header {
+          width: 100%;
+          .clearfix {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            > span {
+              flex: 1;
+            }
+            .el-icon-delete {
+              color: red;
+              cursor: pointer;
+              margin-right: 5px;
+            }
+            .el-icon-edit {
+              color: #40a9ff;
+              cursor: pointer;
+            }
+          }
+        }
+        .el-card__body {
+          height: 100%;
+          width: 100%;
+          display: flex;
+          flex-direction: column;
+          .control_bar {
+            height: 60px;
+            border: 10px;
+            padding: 0 20px;
+            box-sizing: border-box;
+            display: flex;
+            align-items: center;
+            border-bottom: 2px solid #ebeef5;
+            margin-bottom: 20px;
+          }
+          .list {
+            flex: 1 0 auto;
+            height: 0;
+            .list_box {
+              height: 100%;
+              width: 100%;
+              padding: 10px;
+              box-sizing: border-box;
+              overflow: auto;
+              .list-item {
+                width: 15%;
+                margin-right: 2%;
+                margin-bottom: 10px;
+                display: inline-block;
+                .el-card__body {
+                  display: flex;
+                  flex-direction: column;
+                  font-size: 12px;
+                  .img {
+                    width: 100%;
+                    height: 150px;
+                  }
+                  .item {
+                    padding: 5px 0;
+                    display: flex;
+                    > span:first-child {
+                      margin-right: 10px;
+                    }
+                  }
+                }
+              }
+              .margin_0 {
+                margin-right: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

src/views/system/user/index.vue

@@ -9,7 +9,7 @@
         :columns="columns"
         :datasource="datasource"
         :selection.sync="selection"
-        height="calc(100vh - 335px)"
+        height="calc(100vh - 385px)"
         row-key="id"
         cache-key="systemUserTable"
       >
@@ -31,6 +31,7 @@
             icon="el-icon-delete"
             class="ele-btn-icon"
             @click="removeBatch"
+            v-if="$hasPermission('sys:account:delete')"
           >
             删除
           </el-button>
@@ -63,7 +64,9 @@
         </template>
         <!-- 状态列 -->
         <template v-slot:enable="{ row }">
+
           <el-switch
+            v-if="$hasPermission('sys:account:update')"
             v-model="row.enable"
             active-color="#13ce66"
             inactive-color="#ff4949"
@@ -72,6 +75,7 @@
             @change="changeEnable(row)"
           >
           </el-switch>
+          <span v-else>{{row.enable?'开启':'停用'}}</span>
         </template>
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
@@ -80,6 +84,7 @@
             :underline="false"
             icon="el-icon-edit"
             @click="openEdit(row)"
+            v-if="$hasPermission('sys:account:update')"
           >
             修改
           </el-link>
@@ -88,6 +93,7 @@
             :underline="false"
             icon="el-icon-key"
             @click="resetPsw(row)"
+            v-if="$hasPermission('sys:account:update')"
           >
             重置密码
           </el-link>
@@ -97,7 +103,7 @@
             @confirm="remove(row)"
           >
             <template v-slot:reference>
-              <el-link type="danger" :underline="false" icon="el-icon-delete">
+              <el-link type="danger"  v-if="$hasPermission('sys:account:delete')" :underline="false" icon="el-icon-delete">
                 删除
               </el-link>
             </template>

src/views/workforceManagement/team/components/staffSelection.vue

@@ -73,6 +73,17 @@
                         </div>
                       </div>
                     </template>
+                    <template slot-scope="{ row }">
+                      <el-button
+                        size="mini"
+                        type="primary"
+                        @click="choiceAsset(row)"
+                        :disabled="row.disabled"
+                        icon="el-icon-arrow-right"
+                        circle
+                      >
+                      </el-button>
+                    </template>
                   </el-table-column>
                  <el-table-column width="80" label="操作">
 

vue.config.js

@@ -34,7 +34,8 @@ module.exports = {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.176:18086',
+
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''