update step1

src/components/role/Role.vue

 <!--
- * @Description: 角色管理
+ * @Description: 岗位管理
  * @Date: 2019-11-26 11:10:25
  * @Author: 随风
  * @LastEditors: Tao
@@ -33,17 +33,17 @@
                 <img :src="no" alt class="no" @click="cancel" v-else/>
             </div>
             <div class="setdatatwo">
-                <div class="rolesetion">角色信息</div>
-                <div class="rolevip">角色权限</div>
+                <div class="rolesetion">岗位信息</div>
+                <div class="rolevip">岗位权限</div>
             </div>
             <div class="setdatathree">
                 <div class="setdataleft">
                     <div class="rolename">
-                        <span>角色名称</span>
+                        <span>岗位名称</span>
                         <input type="text" v-model="rolename" />
                     </div>
                     <div class="rolediscrle">
-                        <span>角色描述</span>
+                        <span>岗位描述</span>
                         <input type="text" v-model="rolesomething" />
                     </div>
                 </div>
@@ -118,7 +118,7 @@ export default {
                 {
                     model: 'argKeyword',
                     type: 'key',
-                    placeholder: '请输入角色名称等关键字查询'
+                    placeholder: '请输入岗位名称等关键字查询'
                 }
             ],
             searchData: {
@@ -126,8 +126,9 @@ export default {
             },
             tableHead: {
                 NO: '序号',
-                RoleName: '角色名称',
-                RoleDesc: '角色描述',
+                RoleName: '岗位名称',
+                RoleNo: '岗位编号',
+                RoleDesc: '岗位描述',
                 UpdateUserName: '修改人',
                 UpdateTime: '修改时间'
             },
@@ -192,7 +193,7 @@ export default {
                 });
         },
         change5(data) {
-            this.text = '修改角色';
+            this.text = '修改岗位';
             this.data1 = data;
             this.select = 2;
             console.log(data);
@@ -258,7 +259,7 @@ export default {
             event.currentTarget.style.cursor = 'move';
         },
         add() {
-            this.text = '添加角色';
+            this.text = '添加岗位';
             this.select = 1;
             this.changemenu = true;
                this.pdyd1 = true;
@@ -313,7 +314,7 @@ export default {
                 if (!this.rolename && !this.rolesomething) {
                     this.tipchange = true;
                       this.pdyd2 = true;
-                    this.tipword = '角色名或描述不能为空！';
+                    this.tipword = '岗位名或描述不能为空！';
                 } else {
                     this.$axios({
                         method: 'post',
@@ -358,7 +359,7 @@ export default {
                 if (!this.rolename && !this.rolesomething) {
                     this.tipchange = true;
                       this.pdyd2 = true;
-                    this.tipword = '角色名或描述不能为空！';
+                    this.tipword = '岗位名或描述不能为空！';
                 } else {
                     this.$axios({
                         method: 'post',

src/components/user/User.vue

@@ -68,7 +68,7 @@
                 </div>
                 <div class="setdataright">
                     <div class="treeinput">
-                        <span>角色</span>
+                        <span>岗位</span>
                         <select name id v-model="SCMSRoleName" @change="nowchange">
                             <option
                                 :value="item.SCMSRoleName"
@@ -163,8 +163,9 @@ export default {
             tableHead: {
                 NO: '序号',
                 UserAccount: '用户账号',
+                UserNo: '用户编号',
                 UserName: '用户名称',
-                RoleName: '角色名称',
+                RoleName: '岗位名称',
                 Phone: '手机',
                 Email: '邮箱'
             },

src/views/education/component/linePop.vue

@@ -75,6 +75,12 @@
                     <span>{{name}}描述：</span>
                     <textarea v-model="describeV" style="resize:none" class="nametextar" ></textarea>
                 </div>
+
+                <div v-if="type == 4" style="margin-top:10px" class="name">
+                    <span>单位</span>
+                    <input v-model="unit" class="nameipt" />
+                </div>
+
                 <div v-if="type == 6" style="margin-top:10px" class="name">
                     <span>{{name}}编号：</span>
                     <input v-model="numberV2" class="nameipt" />

src/views/education/materiel.vue

@@ -30,23 +30,29 @@
                         prop="NO">
                     </el-table-column>
                     <el-table-column
-                        label="物料名称"
+                        prop="MID"
+                        label="物料编号"
                         :show-overflow-tooltip="true"
-                        prop="Name"
                         width="200">
                     </el-table-column>
                     <el-table-column
-                        prop="MID"
-                        label="物料编号"
+                        label="物料名称"
                         :show-overflow-tooltip="true"
+                        prop="Name"
                         width="200">
                     </el-table-column>
-                     <el-table-column
+                    <el-table-column
                         label="物料描述"
                         :show-overflow-tooltip="true"
                         prop="Desc"
                         width="200">
                     </el-table-column>
+                    <el-table-column
+                        label="单位"
+                        :show-overflow-tooltip="true"
+                        prop="Unit"
+                        width="200">
+                    </el-table-column>
                     <el-table-column
                         label="最近修改时间"
                         :show-overflow-tooltip="true"

src/views/education/technology.vue

@@ -29,12 +29,24 @@
                         width="185"
                         prop="NO">
                     </el-table-column>
+                    <el-table-column
+                        label="工艺编号"
+                        :show-overflow-tooltip="true"
+                        width="185"
+                        prop="Num">
+                    </el-table-column>
                     <el-table-column
                         label="工艺名称"
                         :show-overflow-tooltip="true"
                         prop="Name"
                         width="300">
                     </el-table-column>
+                    <el-table-column
+                        label="工艺描述"
+                        :show-overflow-tooltip="true"
+                        prop="describe"
+                        width="300">
+                    </el-table-column>
                     <el-table-column
                         prop="CellList"
                         label="包含工序"

src/views/education/wordProcedure.vue

@@ -29,6 +29,12 @@
                         width="185"
                         prop="NO">
                     </el-table-column>
+                    <el-table-column
+                        label="工序编号"
+                        :show-overflow-tooltip="true"
+                        prop="No"
+                        width="300">
+                    </el-table-column>
                     <el-table-column
                         label="工序名称"
                         :show-overflow-tooltip="true"

vue.config.js

@@ -23,7 +23,7 @@ module.exports = {
         proxy: {
             '/api': {
                 //这里最好有一个 /
-                target: 'http://192.168.1.182:8802', // 后台接口域名
+                target: 'http://192.168.1.164:8802', // 后台接口域名
                 ws: true, //如果要代理 websockets，配置这个参数
                 secure: false, // 如果是https接口，需要配置这个参数
                 changeOrigin: true, //是否跨域