Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	vue.config.js

src/views/enterpriseModel/dept/components/org-edit.vue

@@ -520,7 +520,7 @@
         this.responsibleName = data.map((item) => item.name).toString();
       },
       addOpen() {
-        this.$refs.addUserRef.open(true);
+        this.$refs.addUserRef.open();
       },
       clearManagerFirst() {
         this.managerFirst = {};

src/views/factoryModel/station/index.vue

@@ -50,7 +50,7 @@
           </el-link>
           <el-popconfirm
             class="ele-action"
-            title="确定要删除此角色吗？"
+            title="确定要删除此工位吗？"
             @confirm="remove(row)"
           >
             <template v-slot:reference>

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

@@ -39,7 +39,7 @@
               size="mini"
               style="width: 120px"
               disabled
-              v-model="dataInfo.status"
+              v-model="dataInfo.approvalStatus"
               placeholder="请选择"
             >
               <el-option
@@ -57,7 +57,7 @@
           <el-button
             type="text"
             @click="handleEdit"
-            v-if="dataInfo.status != 1"
+            v-if="dataInfo.approvalStatus != 1"
           >
             编辑</el-button
           >
@@ -86,16 +86,15 @@
         statusOptions: [
           {
             label: '已停用',
-            value: '2'
+            value: 2
           },
           {
             label: '已发布',
-            value: '1'
+            value: 1
           },
-
           {
             label: '草稿',
-            value: '0'
+            value: 0
           }
         ]
       };
@@ -108,6 +107,7 @@
         }
       }
     },
+    
     methods: {
       handleEdit() {
         this.baseInfoShow = true;

src/views/material/BOMmanage/detailsPop.vue

@@ -50,6 +50,10 @@
               size="mini"
               icon="el-icon-delete"
               @click="remove"
+              v-if="
+                currentNodeData.approvalStatus == 0 ||
+                currentNodeData.approvalStatus == 3
+              "
             >
               删除
             </el-button>
@@ -137,7 +141,7 @@
               type="primary"
               size="mini"
               @click="handleSave"
-              v-if="currentNodeData.status != 1"
+              v-if="currentNodeData.approvalStatus != 1"
             >
               保存
             </el-button>
@@ -637,7 +641,7 @@
       },
 
       handSubmit() {
-        if (this.clientEnvironmentId == 4) {
+        if (this.clientEnvironmentId == 5) {
           this.isSubmit = true;
         } else {
           this.$alert('确定要发布吗?', '提示', {

src/views/material/BOMmanage/index.vue

@@ -212,7 +212,7 @@
 
 
       handSubmit(row) {
-        if (this.clientEnvironmentId == 4) {
+        if (this.clientEnvironmentId == 5) {
           this.JsRId = row.id;
           this.isSubmit = true;
         } else {

src/views/system/organization/components/org-edit.vue

@@ -364,7 +364,7 @@ export default {
       );
     },
     addOpen() {
-      this.$refs.addUserRef.open(true);
+      this.$refs.addUserRef.open();
     },
     clearManagerFirst() {
       this.managerFirst = {};

src/views/system/user/components/add.vue

@@ -61,7 +61,7 @@
         data: [],
         show: false,
         organizationId: '',
-        isHasAccount: false,
+        isHasAccount: '',
         // 表格列配置
         columns: [
           {
@@ -132,24 +132,20 @@
           });
       },
       async open(isHasAccount) {
-        if (isHasAccount) {
-          this.isHasAccount = isHasAccount;
-        }
+        this.isHasAccount = isHasAccount;
         this.query();
         this.show = true;
       },
       /* 表格数据源 */
       async datasource({ page, limit, where, order }) {
-        console.log(this.isHasAccount);
-        // if (!this.isHasAccount) {
-        //   where['hasAccount'] = 0;
-        // }
+
         let data = await getUserPage({
           ...where,
           ...order,
           pageNum: page,
           size: limit,
-          groupId: this.organizationId
+          groupId: this.organizationId,
+          hasAccount:this.isHasAccount||''
         });
 
         return data;

src/views/system/user/components/user-edit.vue

@@ -183,7 +183,7 @@ export default {
   },
   methods: {
     setUsers() {
-      this.$refs.addREf.open();
+      this.$refs.addREf.open('0');
     },
     userBk(data) {
       if (data) {