Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/api/basic/collectPoint/cargowWorkplaceManage.js

@@ -12,6 +12,14 @@ export function bindCollect(query) {
   });
 }
 
+//删除采集工位
+export function delCollect(query) {
+  return axios({
+    url: "/udiwms/sysWorkplace/delCollect",
+    method: "post",
+    data: query
+  });
+}
 
 
 export function getBindCollectList(query) {

src/views/basic/workplace/addCollectWorkplace.vue

@@ -161,20 +161,17 @@ export default {
     //     return collect.workplaceCode === row.workplaceCode && collect.documentTypeCode === row.documentTypeCode
     //   })
     // },
-    // checkSelectable(row) {
-    //   if (this.collectWorks == null) {
-    //     return true
-    //   } else {
-    //     if (this.collectWorks.length > 0) {
-    //       if (this.containsObject(this.collectWorks,row)){
-    //         return -1
-    //       }
-    //      return true
-    //     } else {
-    //       return true
-    //     }
-    //   }
-    // },
+    checkSelectable(row) {
+      if (this.collectWorks == null) {
+        return true
+      } else {
+        if (this.collectWorks.length > 0) {
+          return this.collectWorks.indexOf(row.collectAndTypeCodes) === -1
+        } else {
+          return true
+        }
+      }
+    },
     //新增数据
     handCurrentChange(row) {
       this.rowList = row

src/views/basic/workplace/cargowWorkplaceManage.vue

@@ -184,13 +184,13 @@
             <el-tab-pane>
               <!--              {{ workplaceName }}--->
               <span slot="label">采集工位</span>
-          <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
+              <el-form :inline="true" :model="cargowQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
               >
                 <el-form-item class="query-form-item" label="采集工位名称:">
                   <el-input
-                v-model="busQuery.busKey"
-                placeholder="采集工位名称"
+                    v-model="cargowQuery.keyWords"
+                    placeholder="采集工位/业务名称"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -199,10 +199,10 @@
                     <el-button
                       type="primary"
                       icon="el-icon-refresh"
-                  @click="onBusTypeReset"
+                      @click="onCollectList"
                     >重置
                     </el-button>
-                <el-button type="primary" @click="loadBusList"
+                    <el-button type="primary" @click="loadCollectList"
                                icon="el-icon-search"
                     >查询
                     </el-button
@@ -220,8 +220,8 @@
               >
                 <el-table-column type="index" label="序号"></el-table-column>
                 <!--                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>-->
-            <el-table-column label="采集工位名称" prop="collectName" ></el-table-column>
-            <el-table-column label="业务名称 " prop="busTypeName" ></el-table-column>
+                <el-table-column label="采集工位名称" prop="collectName"></el-table-column>
+                <el-table-column label="业务名称 " prop="busTypeName"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="120">
                   <template slot-scope="scope">
                     <!--                    <el-button-->
@@ -233,19 +233,19 @@
                     <el-button
                       type="text"
                       size="small"
-                  @click.native.stop="removeBusType(scope.row)"
+                      @click.native.stop="removeCollect(scope.row)"
                     >删除
                     </el-button>
                   </template>
                 </el-table-column>
               </el-table>
-          <!--<pagination-->
-          <!--  :total="busTypeTotal"-->
-          <!--  :limit.sync="busQuery.limit"-->
-          <!--  :page.sync="busQuery.page"-->
-          <!--  @pagination="getWorkBindBusTypes()"-->
-          <!--&gt;-->
-          <!--</pagination>-->
+              <pagination
+                :total="collectTotal"
+                :limit.sync="cargowQuery.limit"
+                :page.sync="cargowQuery.page"
+                @pagination="getCargowBindCollectList()"
+              >
+              </pagination>
             </el-tab-pane>
           </el-tabs>
         </el-col>
@@ -262,7 +262,8 @@
           <addCollectWorkplace
             :workplaceId="workplaceId"
             :collectWorks="collectWorks"
-      :closeDialog="closeDialog">
+            :closeDialog="closeDialog"
+          >
 
           </addCollectWorkplace>
         </el-dialog>
@@ -476,17 +477,17 @@ import {
   listPage,
   printWorkLabel, updateWorkplace
 } from '@/api/basic/workPlace/sysWorkplaceManage'
-import {addTree, deleteTree, getTree, updateTree} from '@/api/basic/collectPoint/collectPointManage'
-import { getBindCollectList } from '@/api/basic/collectPoint/cargowWorkplaceManage'
-import addCollectWorkplace from "./addCollectWorkplace"
-
+import { addTree, deleteTree, getTree, updateTree } from '@/api/basic/collectPoint/collectPointManage'
+import { delCollect, getBindCollectList } from '@/api/basic/collectPoint/cargowWorkplaceManage'
+import addCollectWorkplace from './addCollectWorkplace'
 
 export default {
-  components: {addCollectWorkplace},
+  components: { addCollectWorkplace },
   data() {
     return {
       Dictionary: false,
       showSearch: true,
+      workplaceCode: '6001',
       treeList: [
         {
           code: '1001',
@@ -500,13 +501,15 @@ export default {
         code: null,
         workplaceStatus: 1,
         workPlaceClass: 2,
-        deptCode: this.$store.getters.locDeptCode,
+        deptCode: this.$store.getters.locDeptCode
       },
-      DeptList:[],
-      list:[],
-      collectList:[],
-      busTypeTotal:0,
-      total:0,
+      DeptList: [],
+      list: [],
+      collectList: [],
+      collectAndTypeIds: [],
+      users: [],
+      busTypeTotal: 0,
+      total: 0,
       subFormVisible: false,
       subData: {
         parentName: '全部',
@@ -565,7 +568,7 @@ export default {
         0: '完全赋码',
         1: '部分赋码',
         2: '赋码超出',
-        4: '',
+        4: ''
       },
       warnTypeMap: {
         1: '信息提醒',
@@ -574,12 +577,12 @@ export default {
       },
       isPopulars: {
         1: '是',
-        0: '否',
+        0: '否'
       },
       shippers: {
         1: '原始单据的发货方',
         2: '原始单据的收货方',
-        3: '用户所属仓库',
+        3: '用户所属仓库'
       },
       consignees: {
         1: '原始单据的收货方',
@@ -588,7 +591,7 @@ export default {
         4: '客户',
         5: '特殊往来',
         6: '内部科室',
-        7: '填写',
+        7: '填写'
       },
       userList: [],
       userLoading: false,
@@ -598,9 +601,10 @@ export default {
       cargowQuery: {
         page: 1,
         limit: 10,
-        userKey: null,
+        keyWords: null,
         workPlaceCode: null
       },
+      collectTotal:0,
       busQuery: {
         busKey: '',
         workplaceCode: null,
@@ -643,15 +647,16 @@ export default {
       },
       formRules: {
         workplaceName: [
-          {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' }
         // ]
       },
+
     }
   },
   computed: {},
@@ -702,11 +707,11 @@ export default {
         limit: 20,
         workplaceStatus: 1,
         workPlaceClass: 2,
-        deptCode: this.$store.getters.locDeptCode,
+        deptCode: this.$store.getters.locDeptCode
       }
       this.getList()
     },
-    changeDept(){
+    changeDept() {
       this.collectList = []
       this.getList()
     },
@@ -750,27 +755,65 @@ export default {
       // this.getWorkBindBusTypes()
       this.getCargowBindCollectList()
     },
-    getCargowBindCollectList(){
+    getCargowBindCollectList() {
       this.cargowQuery.workPlaceCode = this.rowData.workplaceId
       getBindCollectList(this.cargowQuery).then(res => {
-        if (res.code != 20000){
-          return this.$message.error("获取失败")
+        if (res.code != 20000) {
+          return this.$message.error('获取失败')
         }
         this.collectList = res.data.list || []
+        this.collectTotal = res.data.total || 0
+
       })
     },
-    chooseCollect(){
+    onCollectList() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请选择上货工位')
+      }
+      this.$router.push({
+        path: ''
+      })
+      this.cargowQuery = {
+        page: 1,
+        limit: 10,
+        keyWords: null,
+        workPlaceCode: null
+      },
+        this.getCargowBindCollectList()
+    },
+    loadCollectList() {
+      if (this.rowData.workplaceId == null) {
+        return this.$message.error('请选择上货工位')
+      }
+      this.cargowQuery.page = 1
+      this.getCargowBindCollectList()
+    },
+    chooseCollect() {
       if (this.rowData.workplaceId == null) {
         return this.$message.error('请选择上货工位')
       }
-      console.log("hhhhhhh",this.collectList)
-      this.collectWorks = this.collectList.map(item => ({
-        workplaceCode: item.collectWorkPlaceCode,
-        documentTypeCode: item.collectBusTypeCode
-      }));
+      this.collectWorks = this.collectList.map(item => item.collectAndTypeCodes)
       // this.collectWorks = this.collectWorkPlaceCodes.concat(this.collectBusTypeCodes);
       this.chooseCollectDialogVisible = true
     },
+    removeCollect(row){
+      this.$confirm('此操作将永久删除该采集工位, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delCollect(row).then(res => {
+          if (res.code != 20000) {
+            this.$message.error(res.message)
+          } else {
+            this.$message.success("删除成功")
+            this.getCargowBindCollectList()
+          }
+        })
+      }).catch(() => {
+
+      })
+    },
     handleNodeClick(row) {
       this.groupData = row
       this.query.code = row.code
@@ -779,7 +822,7 @@ export default {
       }
       this.getList()
     },
-    closeDialog(){
+    closeDialog() {
       this.getCargowBindCollectList()
       this.chooseCollectDialogVisible = false
     },
@@ -789,7 +832,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)
@@ -825,7 +868,7 @@ export default {
         workPlaceClass: 2,
         deptCode: null,
         chargeUser: null,
-        constituencies: "1001",
+        constituencies: '1001',
         invRemindNumber: 0,
         remake: null
       }
@@ -837,7 +880,7 @@ export default {
       createWorkplaceId().then(res => {
         if (res.code == 20000) {
           if (res.data == null) {
-            this.formData.workplaceId = this.workplaceCode + 1001
+            this.formData.workplaceId = this.workplaceCode + 1002
             this.addWorkplaceDialogVisible = true
             this.getTree()
           } else {
@@ -852,7 +895,7 @@ export default {
         this.$message.error('获取错误')
       })
     },
-    hideForm(){
+    hideForm() {
       this.addWorkplaceDialogVisible = false
       this.getList()
       this.collectList = []
@@ -889,7 +932,7 @@ export default {
             return this.$message.error(res.message)
           }
           this.addWorkplaceDialogVisible = false
-          this.$message.success("更新成功")
+          this.$message.success('更新成功')
           this.getList()
         }).catch(() => {
           this.addWorkplaceDialogVisible = false
@@ -969,7 +1012,7 @@ export default {
           this.deptList = res.data.list || []
         }
       })
-    },
+    }
   },
   created() {
     this.getDepts()

src/views/basic/workplace/workplaceManage.vue

@@ -421,14 +421,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">
-              <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型">
-                <el-option label="采集工位" :value="1"></el-option>
-                <el-option label="上货工位" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="12" class="el-col">-->
+          <!--  <el-form-item label="工位类型:" prop="workPlaceClass" class="query-form-item">-->
+          <!--    <el-select v-model="formData.workPlaceClass" style="width: 80%" placeholder="工位类型">-->
+          <!--      <el-option label="采集工位" :value="1"></el-option>-->
+          <!--      <el-option label="上货工位" :value="2"></el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <!--<el-col :span="12" class="el-col">-->
           <!--  <el-form-item label="工位类型:" prop="workplaceType" class="query-form-item">-->
           <!--    <el-select v-model="formData.workplaceType" style="width: 80%" placeholder="工位类型">-->