From ffbd2d028f29d5f7dbd2140d235aaa9f3c3a9098 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Fri, 16 Jun 2023 09:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E8=B4=A7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicdata/basicdataGoodsArea.js       |  10 ++
 src/api/distribution/distributionStockup.js   |   6 +
 src/api/system/user.js                        |  11 ++
 .../stockup/distributionStockup.vue           | 122 +++++++++++++++---
 4 files changed, 133 insertions(+), 16 deletions(-)

diff --git a/src/api/basicdata/basicdataGoodsArea.js b/src/api/basicdata/basicdataGoodsArea.js
index 4c71d829..90d2d458 100644
--- a/src/api/basicdata/basicdataGoodsArea.js
+++ b/src/api/basicdata/basicdataGoodsArea.js
@@ -12,6 +12,16 @@ export const getList = (current, size, params) => {
   })
 }
 
+export const stockUp = ( params) => {
+  return request({
+    url: '/api/logpm-basicdata/goodsArea/stockUp',
+    method: 'get',
+    params: {
+      ...params,
+    }
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-basicdata/goodsArea/detail',
diff --git a/src/api/distribution/distributionStockup.js b/src/api/distribution/distributionStockup.js
index b6020b74..5d103697 100644
--- a/src/api/distribution/distributionStockup.js
+++ b/src/api/distribution/distributionStockup.js
@@ -11,6 +11,12 @@ export const getList = (current, size, params) => {
     }
   })
 }
+export const getListUser = () => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/listUser',
+    method: 'get',
+  })
+}
 
 export const getDetail = (id) => {
   return request({
diff --git a/src/api/system/user.js b/src/api/system/user.js
index c83a6aaa..a3bcc609 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -13,6 +13,17 @@ export const getList = (current, size, params, deptId) => {
   });
 };
 
+export const getListOwn = (params, deptId) => {
+  return request({
+    url: '/blade-system/user/user-list',
+    method: 'get',
+    params: {
+      ...params,
+      ...deptId,
+    },
+  });
+};
+
 export const remove = ids => {
   return request({
     url: '/blade-system/user/remove',
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 1c3aeb7c..d1653bd6 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/src/views/distribution/stockup/distributionStockup.vue
@@ -26,7 +26,7 @@
           <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
-            <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)" >指派叉车司机</el-button>
+            <el-button type="primary" text icon="el-icon-edit" @click="handleForklift(row)" >指派叉车司机</el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
           <div class="avue-crud__right">
@@ -81,21 +81,37 @@
           </el-pagination>
         </div>
       </el-row>
-      <el-dialog v-model="dialogFormCustomer" title="修改客户信息">
-        <el-form :model="formCustomer">
-          <el-form-item label="姓名" :label-width="formLabelWidth">
-            <el-input v-model="formCustomer.name" autocomplete="off" />
+      <el-dialog v-model="dialogFormCustomer" title="指派叉车">
+        <el-form :model="form">
+          <el-form-item label="叉车司机" :label-width="formLabelWidth">
+            <el-select v-model="form.forklift" clearable placeholder="请选择叉车司机">
+              <el-option
+                v-for="item in forkliftData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="电话" :label-width="formLabelWidth">
-            <el-input v-model="formCustomer.phone" autocomplete="off" />
+          <el-form-item label="装卸班组" :label-width="formLabelWidth">
+            <el-select v-model="form.loader" clearable placeholder="请选择装卸班组">
+              <el-option
+                v-for="item in loaderData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="地址" :label-width="formLabelWidth">
-            <el-input
-              v-model="formCustomer.address"
-              :rows="2"
-              type="textarea"
-              placeholder="请填写地址"
-            />
+          <el-form-item label="备货区域" :label-width="formLabelWidth">
+            <el-select v-model="form.stockupArea" clearable placeholder="请选择备货区编号">
+              <el-option
+                v-for="item in goodsAreaIdData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-form>
         <template #footer>
@@ -189,7 +205,10 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove } from "@/api/distribution/distributionStockup";
+import { getList, getDetail, add, update, remove,getListUser } from "@/api/distribution/distributionStockup";
+import { getPostList } from '@/api/system/post';
+import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+import { getListOwn } from '@/api/system/user';
 import option from "@/option/distribution/distributionStockup";
 import { mapGetters } from "vuex";
 
@@ -208,7 +227,6 @@ export default {
       // 是否为查看模式
       view: false,
       dialogFormCustomer: false,
-      formCustomer: [],
       formLabelWidth: '120px',
       // 查询信息
       query: {},
@@ -226,6 +244,10 @@ export default {
       option: option,
       // 表单列表
       data: [],
+      forkliftData: [],
+      loaderData: [],
+      goodsAreaIdData: [],
+      deptId: '',
     }
   },
   mounted () {
@@ -243,6 +265,74 @@ export default {
     }
   },
   methods: {
+    //查询叉车人员
+    async getFork(){
+      let ides = '';
+      let ide = {  };
+      await getListUser().then(res =>{
+        // console.log("res>>>",res.data.data);
+        ides = res.data.data.tenantId;
+        this.deptId = res.data.data.deptId;
+      })
+      await getPostList(ides).then(res =>{
+        // console.log(">>>>",res.data.data);
+        res.data.data.forEach(i =>{
+          if(i.postName == "叉车"){
+            ide = i;
+          }
+        })
+      })
+      // console.log("ied>>>>>",ide);
+      let params={
+        postId: ide.id, //岗位
+        deptId: this.deptId, //部门
+        // roleId: '', //角色
+      }
+      getListOwn(Object.assign(params, this.query)).then(res =>{
+
+        console.log(".............",res.data.data);
+        let fo = [];
+        res.data.data.forEach( i =>{
+          let a ={
+            dictKey: i.id,
+            dictValue: i.name
+          };
+          fo.push(a);
+        });
+        this.forkliftData = fo;
+      })
+
+    },
+    //查询班组
+    async getTeam(){
+
+    },
+    //备货区
+    async getStorageArea(){
+      let params ={
+        department: this.deptId
+      }
+      stockUp(params).then(res =>{
+        console.log("res>>>",res.data.data);
+        let fo =[];
+        res.data.data.forEach(i =>{
+          let v = {
+            dictKey: i.id,
+            dictValue: i.headline
+          }
+          fo.push(v)
+        })
+        this.goodsAreaIdData = fo;
+      })
+    },
+     handleForklift(){
+      // console.log(">>");
+      this.dialogFormCustomer = true;
+      this.getFork();
+      this.getTeam()
+       this.getStorageArea();
+
+    },
     //确定通知提货按钮
     callFordelivery(inde){