前端gjy

src/api/V2/warehouse/index.js

@@ -7,12 +7,11 @@ export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
 export const API_GET_WAREHOUSE_CUSTOMDROPDOWN = '/warehouseBaseInfo/selectWarehouse'
 //删除
 export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
-//删除仓库列表
+//查询删除仓库列表
 export const API_GET_WAREHOUSE_DELETELIST = '/warehouseBaseInfo/selectAllWarehouse'
 //隐藏
 export const API_POST_WAREHOUSE_HIDE = '/warehouseBaseInfo/api/editShow'
 
-
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 
 //仓库编辑
@@ -39,3 +38,6 @@ export const API_POST_WAREHOUSE_DEL_POSITION = '/warehousePositionInfo/api/delet
 export const API_POST_WAREHOUSE_DEL_INOUTINFO = '/warehouseInOutInfo/api/deleteWarehouse'
 //临时仓库增加
 export const API_POST_WAREHOUSE_ADD = '/warehouseBaseInfo/api/addTemporaryWarehouse'
+// 获取负责人
+export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+

src/model/warehouse/index.js

@@ -19,7 +19,8 @@ import {
     API_GET_WAREHOUSE_COMPLETE,
     API_POST_WAREHOUSE_DEL_POSITION,
     API_POST_WAREHOUSE_DEL_INOUTINFO,
-    API_POST_WAREHOUSE_ADD
+    API_POST_WAREHOUSE_ADD,
+    API_GET_STAFF
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -60,6 +61,8 @@ export const delInOut = appRx.post(API_POST_WAREHOUSE_DEL_INOUTINFO, errorCatche
 
 //临时库增加add
 export const increase = appRx.post(API_POST_WAREHOUSE_ADD, errorCatcher, errorHandle, filter)
+// 获取负责人 
+export const getstaff = appRx.get(API_GET_STAFF, errorCatcher, errorHandle, filter)
 
 
 

src/views/warehouse/warehouseManagementEdit.vue

@@ -69,11 +69,20 @@
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
-            <ws-input
+            <!-- <ws-input
               v-model="deptBudgetList.warehouseCity"
               placeholder="请输入仓库所在地"
               maxlength="120"
               size="small"
+            /> -->
+            <el-cascader
+              :options="options_"
+              v-model="selectedOptions"
+              clearable
+              size="large"
+              placeholder="请输入仓库所在地"
+              style="width: 200%"
+              @change="handleChange"
             />
           </ws-form-item>
           <!--详细地址-->
@@ -195,7 +204,9 @@ import {
   getLook,
   edit,
   delPosition,
+  getstaff,
 } from '@/model/warehouse/index'
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -243,6 +254,8 @@ export default {
       // 提交类型
       submitType: true,
       size: 10,
+      options_: regionData,
+      selectedOptions: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: [],
@@ -289,8 +302,12 @@ export default {
       this.deptBudgetList = {}
       this.$router.push({ path: 'warehouseManagementList' })
     },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
     warehouseTypechange() {
       this.deptBudgetList = {}
+      this.selectedOptions = []
       this.loaddata()
     },
     marker: function (item) {
@@ -380,6 +397,11 @@ export default {
         .then((response) => {
           this.packtypeList = response
         })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          console.log(response)
+        })
     },
     getUnitList() {
       xiala({
@@ -409,6 +431,15 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          var tmp = []
+          tmp[0] = TextToCode[response.warehousePrivate].code
+          tmp[1] =
+            TextToCode[response.warehousePrivate][response.warehouseCity].code
+          tmp[2] =
+            TextToCode[response.warehousePrivate][response.warehouseCity][
+              response.warehouseArea
+            ].code
+          this.selectedOptions = tmp
           this.deptBudgetList = response
         })
     },
@@ -518,6 +549,12 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
+          this.deptBudgetList.warehousePrivate =
+            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.warehouseCity =
+            CodeToText[this.selectedOptions[1]]
+          this.deptBudgetList.warehouseArea =
+            CodeToText[this.selectedOptions[2]]
           this.deptBudgetList.warehouseType = this.warehouseType
           this.deptBudgetList.baseId = this.baseId
           this.deptBudgetList.compId = this.compId
@@ -527,6 +564,7 @@ export default {
             .then((response) => {
               this.$message.success('编辑成功')
               this.deptBudgetList = {}
+              this.warehouseType = '1'
               this.$router.push({ path: 'warehouseManagementList' })
             })
         } else {

src/views/warehouse/warehouseManagementList.vue

@@ -18,38 +18,23 @@
           />
           添加</ws-button
         >
-        <ws-button
-          @click="handleLook()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >查看</ws-button
-        >
-        <ws-button
-          @click="handleEdit()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >编辑</ws-button
-        >
-        <ws-button
-          @click="handleDelete()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >删除</ws-button
-        >
+        <ws-button @click="handleLook()">查看</ws-button>
+        <ws-button @click="handleEdit()">编辑</ws-button>
+        <ws-button @click="handleDelete()">删除</ws-button>
       </template>
       <template slot="left">
         <div style="margin-top: 2px">
-    <el-radio-group v-model="warehouseType" @change="changeradio"  size="small">
-      <el-radio-button label="1" >自有库</el-radio-button>
-      <el-radio-button label="2" >临时库</el-radio-button>
-      
-    </el-radio-group>
-  </div>
+          <el-radio-group
+            v-model="warehouseType"
+            @change="changeradio"
+            size="small"
+          >
+            <el-radio-button label="1">自有库</el-radio-button>
+            <el-radio-button label="2">临时库</el-radio-button>
+          </el-radio-group>
+        </div>
       </template>
-      <template slot="right" >
+      <template slot="right">
         <ws-input
           v-model="warehouseName"
           placeholder="请输入仓库名"
@@ -80,7 +65,7 @@
         /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div v-show="this.warehouseType == '1'"> 
+    <div v-show="this.warehouseType == '1'">
       <el-table
         class="wenzi"
         :data="warehouseList"
@@ -179,8 +164,8 @@
         </el-table-column>
       </el-table>
     </div>
-    
-      <div v-show="this.warehouseType == '2'">
+
+    <div v-show="this.warehouseType == '2'">
       <el-table
         class="wenzi"
         :data="warehouseList"
@@ -200,7 +185,7 @@
             </div>
           </template>
         </el-table-column>
-        
+
         <el-table-column label="入库量（吨）">
           <template slot-scope="scope">
             <div
@@ -227,7 +212,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-             {{ item.storage }}
+              {{ item.storage }}
             </div>
           </template>
         </el-table-column>
@@ -317,7 +302,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      warehouseType: "1",
+      warehouseType: '1',
       // 提交类型
       submitType: true,
       size: 10,
@@ -345,7 +330,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-    
     //出库
     delivery(item) {
       this.$router.push({
@@ -448,8 +432,8 @@ export default {
         },
       })
     },
-    changeradio(e){
-    this.getList()
+    changeradio(e) {
+      this.getList()
     },
     //查看
     handleLook() {
@@ -502,7 +486,7 @@ export default {
       this.getList()
     },
     getList() {
-        getList({
+      getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         warehouseName: this.warehouseName,
         warehouseType: this.warehouseType,
@@ -680,7 +664,7 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-/deep/.el-radio-button:first-child .el-radio-button__inner{
+/deep/.el-radio-button:first-child .el-radio-button__inner {
   margin-left: 10px;
 }
 </style>