!9 同步

Merge pull request !9 from 打豆豆/master

.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 机加大师
+VUE_APP_TITLE = 智造大师
 
 # 开发环境配置
 ENV = 'development'

.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 机加大师
+VUE_APP_TITLE = 智造大师
 
 # 生产环境配置
 ENV = 'production'

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 机加大师
+VUE_APP_TITLE = 智造大师
 
 NODE_ENV = production
 

public/index.html

@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
-    <title>机加大师</title>
+    <title>智造大师</title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
     html,

src/api/system/role.js

@@ -108,4 +108,13 @@ export function authUserSelectAll(data) {
     method: 'put',
     params: data
   })
+}
+
+// 角色恢复默认菜单权限
+export function resetRole(query) {
+  return request({
+    url: '/system/role/resetRole',
+    method: 'get',
+    params: query
+  })
 }

src/layout/components/Sidebar/Logo.vue

@@ -55,7 +55,7 @@ export default {
 
     & .sidebar-logo {
       width: 100%;
-      height: 100%;
+      height: 85%;
       vertical-align: middle;
       margin-right: 12px;
     }

src/views/login.vue

@@ -217,7 +217,15 @@ export default {
         password: [{ required: true, trigger: "blur", message: "请录入密码" }],
       },
       loginPhoneRules: {
-        phone: [{ required: true, trigger: "blur", message: "请输入手机号码" }],
+        username: [{ required: true, trigger: "blur", message: "请输入手机号码" }],
+        // username: [
+        //   { required: true, message: "手机号码不能为空", trigger: "blur" },
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur",
+        //   },
+        // ],
         password: [{ required: true, trigger: "blur", message: "请录入密码" }],
       },
       passwordType: "password",

src/views/mes/pro/feedback/index.vue

@@ -426,11 +426,11 @@ export default {
         itemCode: null,
         itemName: null,
         specification: null,
-        quantity: null,
+        quantity: 0,
-        quantityUncheck: null,
+        quantityUncheck: 0,
-        quantityFeedback: null,
+        quantityFeedback: 0,
-        quantityQualified: null,
+        quantityQualified: 0,
-        quantityUnquanlified: null,
+        quantityUnquanlified: 0,
         userName: null,
         nickName: null,
         feedbackChannel: null,
@@ -533,7 +533,7 @@ export default {
         }
       });
     },
-    //执行
+    //审批通过执行
     handleExecute(){
       const recordIds = this.form.recordId;
       this.$modal.confirm('确认执行报工？').then(function() {
@@ -544,6 +544,17 @@ export default {
         this.open = false;
       }).catch(() => {});
     },
+    //审批不通过，拒绝
+    handleReject(){
+      this.form.status = "PREPARE";
+      if (this.form.recordId != null) {
+        updateFeedback(this.form).then(response => {
+          this.$modal.msgSuccess("提交成功");
+          this.open = false;
+          this.getList();
+        });
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const recordIds = row.recordId || this.ids;

src/views/mes/pro/schedule/proTask.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"

src/views/mes/qc/defectrecord/index.vue

@@ -6,7 +6,7 @@
     width="80%"
     center
   >
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -14,7 +14,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:qc:defectrecord:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -25,7 +24,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:qc:defectrecord:edit']"
         >常见缺陷</el-button>
       </el-col>      
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -54,7 +52,7 @@
             <el-input-number :min="1" v-model="scope.row.defectQuantity" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" v-if="optType !='view'" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -62,7 +60,7 @@
             icon="el-icon-delete"
             v-if="optType !='view'"
             @click="handleDelete(scope.$index, scope.row)"
-            v-hasPermi="['mes:qc:defectrecord:remove']"
+
           >删除</el-button>
         </template>
       </el-table-column>
@@ -77,7 +75,7 @@
     />
     <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" v-hasPermi="['mes:qc:defectrecord:update']" v-else @click="confirm">确 定</el-button>
+        <el-button type="primary"  v-else @click="confirm">确 定</el-button>
         <el-button @click="showFlag=false">取 消</el-button>
     </div>
   </el-dialog>

src/views/system/role/index.vue

@@ -134,6 +134,7 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-s-help" v-if="scope.row.createBy === 'admin'" @click="restoreRole(scope.row.roleId)">恢复默认菜单权限</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
             <span class="el-dropdown-link">
               <i class="el-icon-d-arrow-right el-icon--right"></i>更多
@@ -254,7 +255,7 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus } from "@/api/system/role";
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus,resetRole } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/system/dept";
 
@@ -603,6 +604,32 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
+    // 恢复默认菜单权限
+    restoreRole(roleId) {
+      console.log(roleId);
+      this.$confirm("确定恢复默认菜单权限吗?", '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        resetRole({roleId:roleId}).then(result => {
+          if (result.code === 200) {
+            this.$notify({
+              title: '成功',
+              message: result.message,
+              type: 'success'
+            })
+            this.getList();
+          } else {
+            this.$notify({
+              title: '失败',
+              message: result.message,
+              type: 'error'
+            })
+          }
+        })
+      }).catch(() => {})
+    },
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/role/export', {

vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require("compression-webpack-plugin");
 
-const name = "机加大师"; // 网页标题
+const name = "智造大师"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
@@ -35,14 +35,14 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       "/prod-api": {
-        target: `http://192.168.3.53:8062`,
+        target: `http://192.168.3.53:8063`,
         changeOrigin: true,
         // pathRewrite: {
         //   ['^' + process.env.VUE_APP_BASE_API]: ''
         // }
       },
       "/ureport": {
-        target: `http://192.168.3.53:8062`,
+        target: `http://192.168.3.53:8063`,
         ws: false,
         changeOrigin: true,
         pathRewrite: {