Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/kucunguanli/cheliangweihu/richangxunjian/cheliangxunjianhandle.vue

@@ -183,6 +183,11 @@ export default {
     },
     // 返回（===既判断）
     handleReturn() {
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.locationSid = ''
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
       this.$emit('doback')
     },
     resetState() {

anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue

@@ -27,7 +27,7 @@
             <el-col :span="12" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>盘库人员:</span></div>
               <el-form-item>
-                <el-select v-model="listQuery.params.inventoryName" placeholder="请选择" filterable @change="changeInventoryName" class="addinputwOne">
+                <el-select v-model="recipientList" placeholder="请选择" multiple filterable style="width: 40%" @change="changeInventoryName" class="addinputwOne">
                   <el-option v-for="item in staff_list" :key="item.sid" :label="item.namePath" :value="item.sid"></el-option>
                 </el-select>
               </el-form-item>
@@ -125,6 +125,7 @@ export default {
       warehouse_list: [],
       staff_list: [],
       stateType_list: [],
+      recipientList: [],
       // 表单数据
       formobj: {
         sid: '',
@@ -223,18 +224,32 @@ export default {
       row.InventoryStateKey = bb.key
     },
     changeInventoryName(value) {
-      let bb = null
-      this.staff_list.forEach((e) => {
-        if (e.sid === value) {
-          bb = {
-            name: e.name,
-            sid: e.sid
+      this.recipientList = value
+      const aa = []
+      const bb = []
+      for (var i = 0; i < this.recipientList.length; i++) {
+        for (var k = 0; k < this.staff_list.length; k++) {
+          if (this.recipientList[i] === this.staff_list[k].sid) {
+            aa.push(this.staff_list[k].name)
+            bb.push(this.staff_list[k].sid)
           }
         }
-      })
-      this.listQuery.params.inventoryName = bb.name
-      this.formobj.inventoryName = bb.name
-      this.formobj.inventorySid = bb.sid
+      }
+      this.formobj.inventoryName = aa.join('、')
+      this.formobj.inventorySid = bb.join('、')
+      // let bb = null
+      // this.staff_list.forEach((e) => {
+      //   if (e.sid === value) {
+      //     bb = {
+      //       name: e.name,
+      //       sid: e.sid
+      //     }
+      //   }
+      // })
+      // this.listQuery.params.inventoryName = bb.name
+      // this.formobj.inventoryName = bb.name
+      // this.formobj.inventorySid = bb.sid
+      console.log(this.formobj)
     },
     handleAdd() {
       this.viewState = 2
@@ -292,6 +307,12 @@ export default {
       if (isreload === 'true') this.$emit('reloadlist')
       // 表单数据
       this.$refs['form_obj'].resetFields()
+      this.recipientList = []
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.locationSid = ''
+      this.listQuery.current = 1
+      this.listQuery.total = 0
+      this.listQuery.size = 5
       this.$emit('doback')
     }
   }