From c96e1b7d9d4796ac24e6a2c660bda4c2980431dc Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 4 Sep 2024 17:56:56 +0800
Subject: [PATCH] =?UTF-8?q?9/4=20=E5=B7=A5=E4=BD=8D=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/workplaceManage.vue | 56 ++++++++++++-------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 4130bd18..5a07d6d8 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -429,7 +429,8 @@
           <el-col :span="12" class="el-col">
             <el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
               <el-select v-model="formData.constituencies" placeholder="请选择所属组别"
-                         style="width: 80%">
+                         style="width: 80%"
+              >
                 <el-option
                   v-for="item in fromDeptOptions"
                   :key="item.code"
@@ -665,16 +666,16 @@ import {
   createWorkplaceId, printWorkLabel, getUsers
 } from '@/api/basic/workPlace/sysWorkplaceManage'
 import { filterAllByUser, filterList, getInvListByUser } from '@/api/system/invWarehouse'
-import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage'
-import {getCollectBusType} from '@/api/basic/collectPoint/gatherOrderType'
+import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
+import { getCollectBusType } from '@/api/basic/collectPoint/gatherOrderType'
 import panelGroup from '@/views/dashboard/PanelGroup'
-import {delUserBindWork, getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
+import { delUserBindWork, getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
 import selectBusType from './selectBusType'
 import addBusTypeDialog from './addBusTypeDialog'
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
-  components: {selectBusType, addBusTypeDialog},
+  components: { selectBusType, addBusTypeDialog },
   data() {
     return {
       query: {
@@ -690,7 +691,7 @@ export default {
       list: [],
       treeList: [
         {
-          code: 1001,
+          code: '1001',
           parentCode: null,
           label: '全部'
         }
@@ -725,32 +726,32 @@ export default {
       filterBadInv: true,
       formRules: {
         workplaceName: [
-          {required: true, message: '请输入工位名称', trigger: 'blur'}
+          { required: true, message: '请输入工位名称', trigger: 'blur' }
         ],
         operationType: [
-          {required: true, message: '请选择作业方式', trigger: 'blur'}
+          { required: true, message: '请选择作业方式', trigger: 'blur' }
         ],
         checkInsert: [
-          {required: true, message: '处理结果不能为空', trigger: 'blur'}
+          { required: true, message: '处理结果不能为空', trigger: 'blur' }
         ],
         // invRemindNumber: [
         //   { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
         // ],
         warnType: [
-          {required: true, message: '请选择提醒方式', trigger: 'blur'}
+          { required: true, message: '请选择提醒方式', trigger: 'blur' }
         ],
         corpType: [
-          {required: true, message: '请选择往来单位类型', trigger: 'blur'}
+          { required: true, message: '请选择往来单位类型', trigger: 'blur' }
         ],
         orderId: [
-          {required: true, message: '请选择单据类型', trigger: 'blur'}
+          { required: true, message: '请选择单据类型', trigger: 'blur' }
         ],
         unitTittle: [
-          {required: true, message: '请输入往来类型标题', trigger: 'blur'}
+          { required: true, message: '请输入往来类型标题', trigger: 'blur' }
         ],
         workplaceStatus: [
-          {required: true, message: '请选择工位状态', trigger: 'blur'}
-        ],
+          { required: true, message: '请选择工位状态', trigger: 'blur' }
+        ]
         // workplaceType: [
         //   { required: true, message: '请选择工位类型', trigger: 'blur' }
         // ]
@@ -892,7 +893,7 @@ export default {
         workplaceStatus: 1,
         deptCode: null,
         chargeUser: null,
-        constituencies: '1001',
+        constituencies: null,
         invRemindNumber: 0,
         remake: null
       }
@@ -942,6 +943,9 @@ export default {
     },
     formSubmit() {
       // this.formData.constituencies = this.groupData.code
+      if (this.formData.constituencies == null) {
+        this.formData.constituencies = '1001'
+      }
       if (this.fromName == 'add') {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
@@ -997,6 +1001,7 @@ export default {
           this.$message.error('错误')
         }
       })
+      this.getTree()
       this.addWorkplaceDialogVisible = true
     },
     deleteWorkplace(row) {
@@ -1046,7 +1051,7 @@ export default {
         const binaryData = []
         binaryData.push(response)
         let url = window.URL.createObjectURL(
-          new Blob(binaryData, {type: 'application/pdf'})
+          new Blob(binaryData, { type: 'application/pdf' })
         )
         this.loading = false
         window.open(url)
@@ -1086,7 +1091,17 @@ export default {
         .then((response) => {
           var treeList = response.data || []
           const filteredList = treeList.filter(item => item.parentCode != null)
-          this.fromDeptOptions = treeList
+          if (treeList.length == 0) {
+            this.fromDeptOptions = [
+              {
+                code: '1001',
+                parentCode: null,
+                label: '全部'
+              }
+            ]
+          } else {
+            this.fromDeptOptions = treeList
+          }
         })
         .catch(() => {
         })
@@ -1233,7 +1248,8 @@ export default {
     getDeptList() {
       this.deptList = []
       let data =
-        {enable: true,
+        {
+          enable: true
         }
       filterList(data).then(res => {
         if (res.code == 20000) {