流水整机人员

pages/aps/complete/index.vue

@@ -40,8 +40,8 @@
             <div class="fa">产品名称：{{ li.productName }}</div>
             <div class="time-s">产品数量：{{ li.quantity }}</div>
             <div class="time-s">
-            <span>工序：{{li.drawnNumber}}</span>
-          </div>
+              <span>工序：{{ li.drawnNumber }}</span>
+            </div>
             <div class="time-s">
               {{ li.demandFinishDate }} ~ {{ li.demandStartDate }}
             </div>
@@ -68,14 +68,33 @@
             </RadioGroup>
           </FormItem>
           <FormItem v-if="formItem.radio == 0">
-            <UserSelect v-model="user" :multiple="true" :type="1" />
+            <UserSelect v-model="user" :multiple="true" :type="2" />
           </FormItem>
           <FormItem label="班组" v-if="formItem.radio == 1">
-            <DepartmentSelect
+            <Select
+              v-model="formItem.shopId"
+              placeholder="请选择"
+              style="width: 300px"
+            >
+              <Option
+                v-for="(item, index) in listClass"
+                :key="index"
+                :value="item.value"
+                :label="item.label"
+                style="display: none"
+              ></Option>
+              <Tree
+                key="mytree"
+                :data="workShop"
+                ref="mytree"
+                :render="renderContent"
+              ></Tree>
+            </Select>
+            <!-- <DepartmentSelect
               :type="2"
               v-model="formItem.shopId"
               style="width: 350px"
-            />
+            /> -->
           </FormItem>
           <FormItem label="备注">
             <Input
@@ -105,7 +124,8 @@ export default {
   data() {
     return {
       list: [],
-
+      workShop: [],
+      listClass: [],
       status: "0", //全部排产-1，0为未排产；2为已排查；
       formItem: {
         radio: "0",
@@ -126,6 +146,7 @@ export default {
   },
   created() {
     this.orderlist(0);
+    this.getWorkshop();
   },
   methods: {
     viewClose() {
@@ -252,7 +273,42 @@ export default {
         },
       });
     },
-    // closeTag() {}
+    //部门（班组）
+    getWorkshop() {
+      let url = `${systemUrl}/department/getdepartmentsbyproterty`;
+      this.$api.get(url, { Property: 2 }).then((r) => {
+        if (r.result) {
+          this.workShop = r.result;
+        }
+      });
+    },
+    renderContent(h, { root, node, data }) {
+      //渲染树的样式
+      return h(
+        "span",
+        {
+          style: {
+            cursor: "pointer",
+          },
+          on: {
+            click: () => {
+              this.handleSelect(data); //手动选择树节点
+            },
+          },
+        },
+        data.name
+      );
+    },
+    handleSelect(data) {
+      let obj = {
+        label: data.name,
+        value: data.id,
+      };
+      this.listClass = [];
+      this.listClass.push(obj);
+      this.formItem.shopId = this.listClass[0].value;
+      this.formItem.shopName = this.listClass[0].label;
+    },
   },
 };
 </script>

pages/aps/stream/set.vue

@@ -24,7 +24,7 @@
           style="width:300px"
           :multiple="true"
         />-->
-        <UserSelect v-model="formItem.userIds" :multiple="true" />
+        <UserSelect v-model="formItem.userIds" :multiple="true" :type="2"/>
       </FormItem>
       <FormItem label="班组" v-if="mode==2" prop="shopId">
         <Select v-model="formItem.shopId" placeholder="请选择" style="width:300px">
@@ -145,8 +145,8 @@ export default {
     closeTag() {},
     //部门（班组）
     getWorkshop() {
-      let url = `${systemUrl}/user/userdepartmentsofworkshop`;
-      this.$api.get(url).then(r => {
+      let url = `${systemUrl}/department/getdepartmentsbyproterty`;
+      this.$api.get(url,{Property:2}).then(r => {
         if (r.result) {
           this.workShop = r.result;
         }
@@ -166,13 +166,13 @@ export default {
             }
           }
         },
-        data.title
+        data.name
       );
     },
     handleSelect(data) {
       let obj = {
-        label: data.title,
-        value: data.value
+        label: data.name,
+        value: data.id
       };
       this.listClass = [];
       this.listClass.push(obj);