更新

src/api/V2/warehouse/index.js

@@ -45,7 +45,7 @@ export const API_POST_WAREHOUSE_CLEARANCEE = '/warehouseBaseInfo/api/editCleared
 //临时出入库合同编号下拉
 export const API_GET_WAREHOUSE_NO = '/warehouseBaseInfo/selectContractNoList'
 // 获取负责人
-export const API_GET_STAFF = '/staff/query/getStaffListByCompId'
+export const API_GET_STAFF = '/staff/query/getStaffListByCompIdAndWarehouseId'
 //临时仓库记录
 export const API_GET_WAREHOUSE_RECORDSS = '/warehouseInOutInfo/selectInfoTemporary'
 

src/views/purchasingManagement/procurementPlanLook.vue

@@ -165,11 +165,7 @@ import {
 
   procurementLook,
 } from '@/model/purchasingManagement/index'
-import { packList } from '@/model/contarct/index'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/salesManagement/salesPlanLook.vue

@@ -164,11 +164,7 @@
 import {
   saleLook,
 } from '@/model/salesManagement/index'
-import { packList } from '@/model/contarct/index'
-import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -64,7 +64,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -505,7 +505,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -710,14 +710,10 @@ import {
   getwarehousename,
   xialaNo,
   addoreditoutput,
-  outexamine,
   getGoodsName,
 } from '@/model/tasksport/index'
-import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -855,20 +851,30 @@ export default {
       var year = date.getFullYear() //获取完整的年份(4位)
       var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
       var datetime = date.getDate() //获取当前日(1-31)
+      var hour = date.getHours()
+      var minutes = date.getMinutes()
+      var seconds = date .getSeconds()
       if (mouth < 10) {
         mouth = '0' + mouth
       }
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year + mouth + datetime
+      if (hour < 10) {
+        hour = '0' + hour
+      }
+      if (minutes < 10) {
+        minutes = '0' + minutes
+      }
+      if (seconds < 10) {
+        seconds = '0' + seconds
+      }
+      return year +''+ mouth + datetime + hour + minutes + seconds
     },
     // 随机验证码
     verifyinit() {
       var arr = []
-      for (var i = 48; i < 123; i++) {
-        if (i > 57 && i < 65) continue
-        if (i > 90 && i < 97) continue
+      for (var i = 48; i < 57; i++) {
         arr.push(String.fromCharCode(i))
       }
       arr.sort(function () {
@@ -959,7 +965,16 @@ export default {
         }
       }
     },
-    selectwarehouseName() {},
+    selectwarehouseName(e) {
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
     changecontract1(e) {
       if (this.dataList1.taskTypeKey != 3) {
         for (let i = 0; i < this.contractNoList.length; i++) {
@@ -1636,14 +1651,7 @@ export default {
             })
         })
       
-      //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.agent = response
-        })
+      
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -781,18 +781,14 @@
 import {
   getwarehousename,
   xialaNo,
-  addoreditoutput,
   outexamine,
   getGoodsName,
   warehousetask,
   woekflowhandle,
   gettaskhistories
 } from '@/model/tasksport/index'
-import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -60,7 +60,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -471,7 +471,7 @@
                 v-for="item in warehouseNameList"
                 :key="item.constKey"
                 :label="item.warehouseName"
-                :value="item.warehouseName"
+                :value="item.id"
               />
             </el-select>
           </el-form-item>
@@ -668,11 +668,10 @@ import {
   outexamine,
   getGoodsName
 } from '@/model/tasksport/index'
-import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
-import { mapActions, mapGetters, mapState } from 'vuex'
+import {  mapGetters } from 'vuex'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
@@ -950,7 +949,16 @@ export default {
         }
       }
     },
-    selectwarehouseName() {},
+    selectwarehouseName(e) {
+      //经办人
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:e})
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+          //  this.agent = response
+        })
+    },
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
         this.dataList.netWeight = Number(
@@ -1086,11 +1094,11 @@ export default {
             if (response.length > 1) {
               this.dataList = response[0]
               this.dataList1 = response[1]
-                console.log(this.dataList1.inOutTaskNo,"入库任务")
+                console.log(this.dataList1.inOutTaskNo,'入库任务')
             } else {
                if(response[0].taskTypeKey==3){
                 this.deletetask=true
-                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf("C") + 1,response[0].inOutTaskNo.length)
+                this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf('C') + 1,response[0].inOutTaskNo.length)
               }
               if(response[0].taskTypeKey==2){
               this.dataList1 = response[0]
@@ -1171,14 +1179,6 @@ export default {
         .then((response) => {
           this.warehouseNameList1 = response
         })
-      //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-          //  this.agent = response
-        })
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -262,9 +262,6 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -243,9 +243,8 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -350,7 +349,7 @@ activated(){
           return '司机名称（临）'
         }
        }
-      return "(临)"
+      return '(临)'
 
       // item.temporaryDriverFlag == 0
     },

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -351,13 +351,11 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { shippingLook, packList, dispatchCat ,delhaulagestage} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -354,7 +354,7 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData} from 'element-china-area-data'
 import { seeCat, packList, feedback, state } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -140,9 +140,8 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {

src/views/warehouse/warehouseManagementAdd.vue

@@ -74,16 +74,17 @@
         <!--其他负责人-->
         <ws-form-item label="其他负责人"  span="1" prop="otherPersonCharge">
           <el-select
-            v-model="deptBudgetList.otherPersonCharge"
+            v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
             @change="selectstaffOther"
             multiple
+            filterable
           >
             <el-option
               v-for="item in optionsOther"
-              :key="item.value"
+              :key="item.staffMobilePhone"
               :label="item.staffName"
-              :value="item.staffName + ' ' + item.staffMobilePhone "
+              :value="item.staffMobilePhone"
             />
           </el-select>
         </ws-form-item>
@@ -268,6 +269,7 @@ export default {
         addressUrl: '',
       },
       options_: regionData,
+      otherPersonPhone:'',
       heightData: '600px',
       zoom: 7,
       selectedOptions: [],
@@ -360,12 +362,14 @@ export default {
       }
     },
     selectstaffOther(e) {
-      // for (var i = 0; i < this.staffList.length; i++) {
-      //   if (this.staffList[i].staffName == e) {
-      //     this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
-      //     this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-      //   }
-      // }
+      this.deptBudgetList.otherPersonCharge = ''
+      for (var i = 0; i < this.optionsOther.length; i++) {
+        for(var j=0;j<e.length;j++){
+          if (this.optionsOther[i].staffMobilePhone == e[j]) {
+            this.deptBudgetList.otherPersonCharge += this.optionsOther[i].staffName + ' '+ this.optionsOther[i].staffMobilePhone + ','
+          }
+        }
+      }
     },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
@@ -523,7 +527,8 @@ export default {
           .then(() => {
             this.$refs.deptBudgetList.validate((valid) => {
               if (valid) {
-                this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+                // this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+                this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
                 this.deptBudgetList.compId =
                   sessionStorage.getItem('ws-pf_compId')
                 this.deptBudgetList.warehousePrivate =

src/views/warehouse/warehouseManagementDelivery.vue

@@ -332,7 +332,7 @@ export default {
       agent: [],
        staffList: [],
       options: [],
-      value:"",
+      value:'',
       rules: {
         netWeight: [
           {
@@ -1170,7 +1170,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.deptBudgetList.baseId })
         .toPromise()
         .then((response) => {
           // this.agent = response

src/views/warehouse/warehouseManagementEdit.vue

@@ -80,15 +80,17 @@
           <!--其他负责人-->
         <ws-form-item label="其他负责人"  v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
           <el-select
-            v-model="deptBudgetList.otherPersonCharge"
+            v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
+            @change="selectstaffOther"
+            filterable 
             multiple
           >
             <el-option
               v-for="item in optionsOther"
-              :key="item.value"
+              :key="item.staffMobilePhone"
               :label="item.staffName"
-              :value="item.staffName + ' ' + item.staffMobilePhone "
+              :value="item.staffMobilePhone "
             />
           </el-select>
         </ws-form-item>
@@ -319,7 +321,7 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.baseId })
       .toPromise()
       .then((response) => {
         this.options = response
@@ -346,6 +348,16 @@ export default {
     },
   },
   methods: {
+     selectstaffOther(e) {
+      this.deptBudgetList.otherPersonCharge = ''
+      for (var i = 0; i < this.optionsOther.length; i++) {
+        for(var j=0;j<e.length;j++){
+          if (this.optionsOther[i].staffMobilePhone == e[j]) {
+            this.deptBudgetList.otherPersonCharge += this.optionsOther[i].staffName + ' '+ this.optionsOther[i].staffMobilePhone + ','
+          }
+        }
+      }
+    },
     close(index){
       this.addressUrls.splice(index,1)
     },
@@ -521,7 +533,7 @@ export default {
           //   this.fileList =  this._getFileList(this.deptBudgetList.addressUrl)
           // }
           this.addressUrls = this.deptBudgetList.addressUrl.split(',')
-           this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.split(',')
+          this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.split(',')
           this.addressUrls.pop()
         })
     },
@@ -654,7 +666,7 @@ export default {
           this.deptBudgetList.baseId = this.baseId
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
-           this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
+           this.deptBudgetList.otherPersonPhone=this.deptBudgetList.otherPersonPhone.toString()
           edit(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -879,7 +879,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.baseId })
         .toPromise()
         .then((response) => {
           this.options = response

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -964,7 +964,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:this.dataList.id })
         .toPromise()
         .then((response) => {
           this.options = response

src/views/warehouse/warehouseManagementPut.vue

@@ -1199,7 +1199,7 @@ export default {
           this.outContractNo = response
         })
       //经办人
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') ,warehouseId:this.deptBudgetList.baseId })
         .toPromise()
         .then(response => {
           this.options = response

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.120:8090/',
+        target: 'http://192.168.1.122:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',