From 7cc82ec0606ca68f648633f43270994cad9f2237 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 16 Aug 2024 19:32:33 +0800
Subject: [PATCH] =?UTF-8?q?8/16=20=20=E5=B7=A5=E4=BD=8D=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/collectPoint/gatherOrderType.vue    |  19 ++--
 .../basic/collectPoint/selectWorkplace.vue    |   8 +-
 .../basic/collectPoint/userWorkplace.vue      |   8 +-
 src/views/basic/workplace/workplaceManage.vue | 107 ++++++++++++------
 4 files changed, 96 insertions(+), 46 deletions(-)

diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 7607ba2b..61d6aab4 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -124,13 +124,13 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="12" class="el-col">
-              <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">
-                <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"
-                           style="width: 80%"
-                />
-              </el-form-item>
-            </el-col>
+            <!--<el-col :span="12" class="el-col">-->
+            <!--  <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">-->
+            <!--    <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"-->
+            <!--               style="width: 80%"-->
+            <!--    />-->
+            <!--  </el-form-item>-->
+            <!--</el-col>-->
           </el-row>
             <el-row :gutter="24" class="el-row">
             <el-col :span="22" class="el-col">
@@ -247,7 +247,9 @@ export default {
       genCode().then(res => {
         if (res.code == 20000){
           this.code = res.data
-          this.formData.code = res.data
+          this.formData = {
+            code: res.data
+          }
           this.addCollectionPointsDialogVisible = true
         }
       })
@@ -288,6 +290,7 @@ export default {
       this.addCollectionPointsDialogVisible = false
     },
     formSubmit() {
+      this.formData.invCode =  this.$store.getters.locInvCode
       if (this.fromName == 'add') {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
diff --git a/src/views/basic/collectPoint/selectWorkplace.vue b/src/views/basic/collectPoint/selectWorkplace.vue
index 82dd1193..fb1ce51c 100644
--- a/src/views/basic/collectPoint/selectWorkplace.vue
+++ b/src/views/basic/collectPoint/selectWorkplace.vue
@@ -359,12 +359,14 @@ export default {
         3: '按单不校验三期'
       },
       checkInserts: {
-        1: '不插入',
-        2: '插入',
+        1: '插入',
+        2: '不插入',
+        3: '提醒不插入'
       },
       warnTypeMap: {
         1: '信息提醒',
-        2: '禁止录入',
+        2: '信息弹框提醒',
+        3: '不提醒'
       },
       corpTypeMap: {
         1: '客户',
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 95d83868..36086931 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -387,12 +387,14 @@ export default {
         3: '按单不校验三期'
       },
       checkInserts: {
-        1: '不插入',
-        2: '插入'
+        1: '插入',
+        2: '不插入',
+        3: '提醒不插入'
       },
       warnTypeMap: {
         1: '信息提醒',
-        2: '禁止录入'
+        2: '信息弹框提醒',
+        3: '不提醒'
       },
       corpTypeMap: {
         1: '客户',
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 4d19204e..879117c6 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -278,7 +278,7 @@
         <el-row :gutter="24" class="el-row">
           <el-col :span="12" class="el-col">
             <el-form-item label="作业方式:" prop="operationType" class="query-form-item">
-              <el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable>
+              <el-select v-model="formData.operationType" style="width: 80%" placeholder="选择扫码方式" clearable @change="changeCheckInsert">
                 <el-option label="扫码生成业务单" :value="1"></el-option>
                 <el-option label="按单校验三期" :value="2"></el-option>
                 <el-option label="按单不校验三期" :value="3"></el-option>
@@ -289,9 +289,10 @@
 
           <el-col :span="12" class="el-col">
             <el-form-item label="结果处理:" prop="checkInsert" class="query-form-item">
-              <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable >
-                <el-option label="不插入" :value="1"></el-option>
-                <el-option label="插入" :value="2"></el-option>
+              <el-select v-model="formData.checkInsert" style="width: 80%" placeholder="选择扫码方式" clearable :disabled="formData.operationType == 1">
+                <el-option label="插入" :value="1"></el-option>
+                <el-option label="不插入" :value="2"></el-option>
+                <el-option label="提醒不插入" :value="3"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -300,14 +301,31 @@
             <el-form-item label="提醒方式:" prop="warnType" class="query-form-item">
               <el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式" clearable>
                 <el-option label="信息提醒" :value="1"></el-option>
-                <el-option label="禁止录入" :value="2"></el-option>
+                <el-option label="信息弹框提醒" :value="2"></el-option>
+                <el-option label="不提醒" :value="3"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item prop="deptCode" label="当前部门:">
+              <el-select v-model="formData.deptCode" placeholder="请选择部门" clearable
+                         style="width: 80%"
+                         @change="deptChange">
+                <el-option
+                  v-for="item in deptList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
           <el-col :span="12" class="el-col">
-            <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">
-              <el-select v-model="formData.invCode" placeholder="请选择所属仓库"
+            <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
+              <el-select v-model="formData.invCode" placeholder="请选择仓库"
                          style="width: 80%"
                          clearable
                          @change="handleInvChange"
@@ -509,7 +527,7 @@ import {
   deleteWorkplace,
   createWorkplaceId, printWorkLabel, getUsers
 } from '@/api/basic/sysWorkplaceManage'
-import { getInvListByUser } from '@/api/system/invWarehouse'
+import { filterAllByUser, getInvListByUser } from '@/api/system/invWarehouse'
 import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
 import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
 import panelGroup from '@/views/dashboard/PanelGroup'
@@ -542,7 +560,8 @@ export default {
         'edit': '编辑工位'
       },
       formData: {
-        operationType: 1
+        operationType: 1,
+        deptCode: null
       },
       workplaceCode: '6001',
       unitStorageList: [],
@@ -553,21 +572,21 @@ export default {
         workplaceName: [
           { required: true, message: '请输入工位名称', trigger: 'blur' }
         ],
-        operationType: [
-          { required: true, message: '请选择作业方式', trigger: 'blur' }
-        ],
-        checkInsert: [
-          { required: true, message: '处理结果是否插入', trigger: 'blur' }
-        ],
-        warnType: [
-          { required: true, message: '提醒方式', trigger: 'blur' }
-        ],
-        invCode: [
-          { required: true, message: '请选择仓库', trigger: 'blur' }
-        ],
-        orderId: [
-          { required: true, message: '请选择单据类型', trigger: 'blur' }
-        ],
+        // operationType: [
+        //   { required: true, message: '请选择作业方式', trigger: 'blur' }
+        // ],
+        // checkInsert: [
+        //   { required: true, message: '处理结果是否插入', trigger: 'blur' }
+        // ],
+        // warnType: [
+        //   { required: true, message: '提醒方式', trigger: 'blur' }
+        // ],
+        // invCode: [
+        //   { required: true, message: '请选择仓库', trigger: 'blur' }
+        // ],
+        // orderId: [
+        //   { required: true, message: '请选择单据类型', trigger: 'blur' }
+        // ],
       },
       invQuery: {
         invCode: ''
@@ -586,12 +605,14 @@ export default {
         4: '特殊往来',
       },
       checkInserts: {
-        1: '不插入',
-        2: '插入'
+        1: '插入',
+        2: '不插入',
+        3: '提醒不插入'
       },
       warnTypeMap: {
         1: '信息提醒',
-        2: '禁止录入'
+        2: '信息弹框提醒',
+        3: '不提醒'
       },
       userList: [],
       userLoading: false,
@@ -614,7 +635,8 @@ export default {
       groupData: null,
       total: 0,
       userTotal: 0,
-      workplaceName: '用户'
+      workplaceName: '用户',
+      deptList:[]
     }
   },
   computed: {},
@@ -654,13 +676,13 @@ export default {
           if (res.data == null) {
             this.formData.workplaceId = this.workplaceCode + 1001
             this.formData.operationType = 1
-            this.formData.checkInsert = 2
+            this.formData.checkInsert = 1
             this.addWorkplaceDialogVisible = true
             this.getTree()
           } else {
             this.formData = {
               operationType: 1,
-              checkInsert: 2
+              checkInsert: 1
             }
             this.getTree()
             this.formData.workplaceId = res.data
@@ -768,7 +790,8 @@ export default {
     },
     getInvList() {
       let query = {
-        advanceType: 1
+        advanceType: 1,
+        deptCode: this.formData.deptCode
       }
       getInvListByUser(query)
         .then((response) => {
@@ -951,14 +974,34 @@ export default {
         })
       }
 
+    },
+    getDeptList() {
+      this.deptList = [];
+      filterAllByUser()
+        .then((response) => {
+          this.deptList = response.data || [];
+          this.getInvList();
+        })
+        .catch(() => {
+        });
+    },
+    deptChange() {
+      this.getInvList();
+      this.formData.invCode = "";
+    },
+    changeCheckInsert(){
+      if (this.formData.operationType == 1){
+        this.formData.checkInsert = 1
+      }
     }
   },
   created() {
     this.getList()
-    this.getInvList()
+    // this.getInvList()
     this.getBusType()
     this.getTree()
     this.getLstTree()
+    this.getDeptList()
   }
 }
 </script>