Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

components/page/storeTree.vue

@@ -19,13 +19,19 @@
     </div>
     <div class="fg">
       <div class="tree">
-        <Tree :data="data" :render="renderContent" ref="tree" @on-select-change="change"></Tree>
+        <Tree
+          :data="data"
+          :render="renderContent"
+          ref="tree"
+          @on-select-change="change"
+        ></Tree>
       </div>
     </div>
   </div>
 </template>
 
 <script>
+import { forEach } from "lodash";
 export default {
   name: "",
   data() {
@@ -64,7 +70,24 @@ export default {
             },
             "upId"
           );
-          this.list = this.$u.clone(data);
+          let creatorUserId = this.$store.state.userInfo.userId;
+          console.log(creatorUserId);
+          let list = this.$u.clone(data);
+          let newlist = [];
+          list.filter((e, index) => {
+            let userIds = [];
+            let obj = {};
+            if (e.upId == 0) {
+              userIds = e.userIds.split(",");
+              userIds.forEach((v) => {
+                if (creatorUserId == v) {
+                  newlist.push(e);
+                }
+              });
+            }
+          });
+          // console.log(newlist);
+          this.list = newlist;
         });
     },
     toggle() {
@@ -124,6 +147,7 @@ export default {
       let items = this.$u.clone(this.list);
       let expand = this.expand;
       let result = [];
+
       search(this.keys, items);
       function search(keys, data) {
         data.map((u) => {

components/page/userSelect.vue

@@ -124,7 +124,7 @@ export default {
                 // pageIndex: 1,
                 departmentId: id,
                 type: this.type,
-                roleTitle: this.roleTitle,
+                roleTitle: this.roleTitle,  //检验
                 // pageSize: 0
             };
             if (this.type == 99) { //开发组

pages/qc/certificate/waitOpened/add.vue

@@ -154,7 +154,7 @@
         </Col>
         <Col :span="6">
           <FormItem :label="l('examUser')" prop="examUser">
-            <UserSelect ref="examUser" v-model="entity.examUser" />
+            <UserSelect ref="examUser" v-model="entity.examUser" :roleTitle='roleTitle'/>
           </FormItem>
         </Col>
         <!-- <Col :span="6">
@@ -196,6 +196,7 @@ export default {
   data() {
     return {
       isId: "",
+      roleTitle:"检验",
       examineModal: false,
       submit: true,
       isDisabled: false,
@@ -213,6 +214,7 @@ export default {
         id: 0,
         status: 0,
         items: [],
+        userUnit:''
       },
       rules: {
         // userUnit: [{ required: true, message: "必填", trigger: "change" }],