Merge branch 'dev' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc into dev

src/api/V2/statisticalReport/index.js

@@ -81,7 +81,8 @@ export const API_POST_ADDDISORREMARKS = '/stockPurchaseReceiptReport/api/disAndR
 export const API_POST_EDITSETTLEMENTWEIGHT = '/stockPurchaseReceiptReport/api/edit'
 //现货采购入库合同
 export const API_GET_STOCK_PURCHASE_CONTRACTNO = '/stockPurchaseReceiptReport/selectContractNoList'
-
+//现货采购入库导出
+export const API_GET_STOCK_PURCHASE_EXPORT ='/stockPurchaseReceiptReport/export'
 
 //现货销售出库报表
 export const API_GET_STOCKSALECEIPT = '/stockSaleReceiptReport/selectSaleOrder'

src/api/V2/warehouse/index.js

@@ -98,3 +98,9 @@ export const API_GET_TURNAROUND_LIST = '/turnInfo/selectTurnInfo'
 export const API_GET_TURNAROUND_XIALA = '/turnInfo/getPositionAndGoodsName'
 //折转后货名
 export const API_get_goodsName_All = '/commonSysParameter/getInfo'
+//查看仓储部负责人
+export const API_GET_WAREHOUSE_RESPONSIBLE = '/staff/query/getPost'
+//修改自动创建的临时库入库量
+export const API_POST_WAREHOUSE_INWEIGHT = '/warehouseInOutInfo/updateStockQuantity'
+//查看全部仓库
+export const API_GET_WAREHOUSE_ALL = '/warehouseBaseInfo/allWarehouse'

src/model/statisticalReport/index.js

@@ -48,7 +48,8 @@ import {
     API_GET_YUNSHUNUMBER,
     API_POST_YUNSHUSETPRICE,
     API_POST_EDIT_SETTLEMENTWEIGHT,
-    API_POST_INVOICELIST
+    API_POST_INVOICELIST,
+    API_GET_STOCK_PURCHASE_EXPORT
 } from '@/api/V2/statisticalReport'
 //期货采购入库报表
 export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)
@@ -94,7 +95,7 @@ export const postopeninvoice = appRx.post(API_POST_OPENINVOICE, errorCatcher, er
 export const postbatchopeninvoice = appRx.post(API_POST_BATCHOPENINVOICE, errorCatcher, errorHandle, filter)
 
 
-
+export const export1 = appRx.post(API_GET_STOCK_PURCHASE_EXPORT)
 //期货销售出库报表
 export const salelist = appRx.get(API_GET_SALELIST, errorCatcher, errorHandle, filter)
 //期货销售出库出纳收款

src/model/warehouse/index.js

@@ -49,6 +49,9 @@ import {
     API_POST_TURNAROUND_ADD,
     API_GET_TURNAROUND_XIALA,
     API_get_goodsName_All,
+    API_GET_WAREHOUSE_RESPONSIBLE,
+    API_POST_WAREHOUSE_INWEIGHT,
+    API_GET_WAREHOUSE_ALL
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -144,7 +147,12 @@ export const turnAroundList = appRx.get(API_GET_TURNAROUND_LIST,errorCatcher, er
 export const turnAroundXiaLa = appRx.get(API_GET_TURNAROUND_XIALA,errorCatcher, errorHandle, filter)
 //折转后所有货名
 export const turnAroundGoodsNameAll = appRx.get(API_get_goodsName_All,errorCatcher, errorHandle, filter)
-
-
 //储量明细
 export const  getreserves = appRx.get(API_GET_WAREHOUSE_BASEINFO_RESERVES, errorHandle, filter)
+//查看仓储部负责人
+export const  getResponsible = appRx.get(API_GET_WAREHOUSE_RESPONSIBLE, errorHandle, filter)
+//修改自动创建的临时库入库量
+export const  postInWeight = appRx.post(API_POST_WAREHOUSE_INWEIGHT, errorHandle, filter)
+//查看全部仓库
+export const  getWarehouseAll = appRx.get(API_GET_WAREHOUSE_ALL, errorHandle, filter)
+

src/views/contractManagement/salesContractAdd.vue

@@ -15,7 +15,7 @@
         <div class="remark">
           <h3>基本信息</h3>
           <p style="color: #8890b1">
-            &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
+            &nbsp;&nbsp;注：基本信息均为必填项，“<span style="color:red">*</span>”
             标记的条目提交后不可修改。
           </p>
         </div>
@@ -1064,13 +1064,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
-          this.$message({
-            message: '请输入水分',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
+        //   this.$message({
+        //     message: '请输入水分',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           (this.deptBudgetList.contractGoodsInfo.waterContent &&
             String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf(
@@ -1098,13 +1098,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-          this.$message({
-            message: '请输入杂质',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+        //   this.$message({
+        //     message: '请输入杂质',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           (this.deptBudgetList.contractGoodsInfo.impurity &&
             String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=
@@ -1124,13 +1124,13 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-          this.$message({
-            message: '请输入容重',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+        //   this.$message({
+        //     message: '请输入容重',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf(
@@ -1151,15 +1151,15 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-          this.$message({
-            message: '请输入霉变粒',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+        //   this.$message({
+        //     message: '请输入霉变粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+          this.deptBudgetList.contractGoodsInfo.mildewGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
               '.'
             ) != -1 &&
@@ -1178,15 +1178,15 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-          this.$message({
-            message: '请输入热损伤',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+        //   this.$message({
+        //     message: '请输入热损伤',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+          this.deptBudgetList.contractGoodsInfo.jiaorenli ||
           (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
             -1 &&
             String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
@@ -1204,15 +1204,15 @@
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-          this.$message({
-            message: '请输入不完善粒',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+        //   this.$message({
+        //     message: '请输入不完善粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (
-          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+          this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
           (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
               '.'
             ) != -1 &&

src/views/contractManagement/storageContract.vue

@@ -51,7 +51,7 @@
       </el-table-column>
       <el-table-column prop="grainMoney" label="粮款（元）"> </el-table-column>
       <el-table-column prop="storageFeeNew" label="代储费（元）"> </el-table-column>
-      <el-table-column width='120' prop="total" label="合计应收（元）"> 
+      <el-table-column width='120' prop="total" label="合计应收（元）">
       </el-table-column>
       <el-table-column prop="received" label="已收（元）"> </el-table-column>
       <el-table-column width='120' prop="goodsNames" label="已开发票（元）"> </el-table-column>
@@ -346,7 +346,7 @@
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
-            agreementType:'代储合同',
+            agreementType: '代储合同',
             startDate: this.startDate,
             endDate: this.endDate,
             contrPage: this.contrPage,
@@ -357,20 +357,20 @@
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }
-              if(response.records[i].grainMoney&&response.records[i].storageFeeNew){
-                response.records[i].total = response.records[i].grainMoney+response.records[i].storageFeeNew
-              }else if(response.records[i].grainMoney){
+              if (response.records[i].grainMoney && response.records[i].storageFeeNew) {
+                response.records[i].total = response.records[i].grainMoney + response.records[i].storageFeeNew
+              } else if (response.records[i].grainMoney) {
                 response.records[i].total = response.records[i].grainMoney
-              }else if(response.records[i].storageFeeNew){
+              } else if (response.records[i].storageFeeNew) {
                 response.records[i].total = response.records[i].storageFeeNew
               }else{
                 response.records[i].total = 0
               }
-               if(response.records[i].grainMoneyEd&&response.records[i].depositReceived){
-                response.records[i].received = response.records[i].grainMoneyEd+response.records[i].depositReceived
-              }else if(response.records[i].grainMoneyEd){
+              if (response.records[i].grainMoneyEd && response.records[i].depositReceived) {
+                response.records[i].received = response.records[i].grainMoneyEd + response.records[i].depositReceived
+              } else if (response.records[i].grainMoneyEd) {
                 response.records[i].received = response.records[i].grainMoneyEd
-              }else if(response.records[i].depositReceived){
+              } else if (response.records[i].depositReceived) {
                 response.records[i].received = response.records[i].depositReceived
               }else{
                 response.records[i].received = 0
@@ -504,17 +504,17 @@
         const {
           data
         } = await export3({
-         compId: localStorage.getItem('ws-pf_compId'),
-            contractType: this.contractType,
-            goodsType: this.goodsType,
-            currentPage: this.currentPage,
-            pageSize: this.pageSize,
-            searchType: this.searchType,
-            searchKeyWord: this.searchKeyWord,
-            agreementType:'代储合同',
-            startDate: this.startDate,
-            endDate: this.endDate,
-            contrPage: this.contrPage,
+          compId: localStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          goodsType: this.goodsType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          agreementType: '代储合同',
+          startDate: this.startDate,
+          endDate: this.endDate,
+          contrPage: this.contrPage,
         }, {}, {
           responseType: 'blob',
         }).toPromise()
@@ -564,7 +564,12 @@
         this.$router.push({
           name: 'storageContractRecord',
           query: {
-            id: row.id,
+            contractNo: row.contractNo,
+            buyer: row.buyer,
+            weight: row.weight,
+            completedQuantity: row.completedQuantity,
+            total: row.total,
+            received: row.received,
           },
         })
       },

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -502,7 +502,7 @@
 			},
 			returnsales() {
 				this.dataList = {
-								taskTypeKey: 1
+								taskTypeKey: '1'
 							}
 				this.$router.push({
 					path: 'tranManagementWarehouseInOuttask'
@@ -765,7 +765,7 @@
 						this.$message.success('添加成功')
 						setTimeout(function() {
 							that.dataList = {
-								taskTypeKey: 1
+								taskTypeKey: '1'
 							}
 							that.dataList1 = {}
 							that.$router.push({

src/views/warehouse/warehouseManagementIoss.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">&nbsp;&nbsp;盘损当期仓损</h2>
+        <h2 class="bg-left title">&nbsp;&nbsp;盘点当期盈亏</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button

src/views/warehouse/warehouseManagementList.vue

@@ -135,6 +135,7 @@
             <div class="adjustment" v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.view`
           " @click="mintor(scope.row)">监控</div>
+
            <div v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.turn`" class="adjustment" @click="transformation(scope.row)">折转</div>
           </template>

src/views/warehousenew/component/router/index.js

@@ -86,7 +86,7 @@ const warehouseManagementRouter = {
       hidden:true
     },
     {
-      path: 'warehouseManagementAdd',
+      path: 'warehouseNewManagementAdd',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementAdd'),
       name: 'warehouseManagementAdd',
@@ -102,7 +102,7 @@ const warehouseManagementRouter = {
     },
 
     {
-      path: 'warehouseManagementEdit',
+      path: 'warehouseNewManagementEdit',
              
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementEdit'),
@@ -117,7 +117,7 @@ const warehouseManagementRouter = {
       hidden: true
     },
     {
-      path: 'warehouseManagementLook',
+      path: 'warehouseNewManagementLook',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementLook'),
       name: 'warehouseManagementLook',
@@ -218,7 +218,7 @@ const warehouseManagementRouter = {
       hidden: true
     },
     {
-      path: 'warehouseManagementIoss',
+      path: 'warehouseNewManagementIoss',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementIoss'),
       name: 'warehouseManagementIoss',
@@ -251,7 +251,7 @@ const warehouseManagementRouter = {
     },
 
     {
-      path: 'warehouseManagementRecord',
+      path: 'warehouseNewManagementRecord',
       component: () =>
         import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/warehouseManagementRecord'),
       name: 'warehouseManagementRecord',

src/views/warehousenew/warehouseManagement.vue

@@ -1,662 +1,365 @@
 <!--仓库管理-->
 <template>
   <div>
+    <el-row>
+      <el-col :span="12">
+        <div class="bg-left title"><span class="top_title">全部仓库</span></div>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img  width="6" height="10" style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回</el-button>
+      </el-col>
+    </el-row>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left">
-        <div>
+        <div class="top_select">
           <ws-select
-              v-model="warehouseName"
-              placeholder="请选择仓库名称"
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
+            v-model="warehouseName1"
+            placeholder="请选择仓库名称"
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <ws-option key="" label="全部仓库" value="" />
             <ws-option
-                key=""
-                label="全部仓库"
-                value=""
-              />
-              <ws-option
-                v-for="item in packtypeList"
-                :key="item.constKey"
-                :label="item.warehouseName"
-                :value="item.warehouseName"
-              />
-            </ws-select>
-            <ws-select
-              v-model="goodsName"
-              placeholder="请选择类型"
-              class="typeselect"
-              @change="selectgoodsName"
-            >
+              v-for="(item,index) in packtypeList"
+              :key="item.constKey"
+              :label="item.warehouseName"
+              :value="index"
+            />
+          </ws-select>
+          <ws-select
+            v-model="goodsName"
+            placeholder="请选择类型"
+            class="typeselect"
+            @change="selectgoodsName"
+          >
+            <ws-option key="" label="全部粮食" value="" />
             <ws-option
-                key=""
-                label="全部粮食"
-                value=""
-              />
-              <ws-option
-                v-for="item in goodsnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
+              v-for="item in goodsnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
         </div>
       </template>
-      <template slot="right">
-       
-      </template>
+      <template slot="right"> </template>
     </BaseHeaderLayout>
-      <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
-        style="width: 100%; margin-top: 20px" height="calc(100% - 45px)">
-        <el-table-column prop="warehouseName" label="仓库名">
-        </el-table-column>
-        <el-table-column prop="binNumber" label="仓位编号">
-        </el-table-column>
-        <el-table-column prop="capacity" label="容量（吨）">
-          <template slot-scope="scope">
-            <div v-if="scope.row.capacity != 'null' && scope.row.capacity != null">
-              {{ scope.row.capacity }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="品种">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{ item.goodsName }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="入库量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{item.inNetWeight}}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="出库量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{ item.outNetWeight }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="应余量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{ item.storage }}
-            </div>
-          </template>
-        </el-table-column>
-        
-      </el-table>
-      <!-- <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="780">
-        <el-table-column type="index" label="序号" width="80">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="warehouseName" label="仓库名" width="80">
-        </el-table-column>
-        <el-table-column prop="address" label="临时仓库地址">
-          <template slot-scope="scope">
-            <div v-if="scope.row.address != 'null' && scope.row.address != null">
-              {{ scope.row.address }}
-            </div>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="入库量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{ item.goodsName}}({{item.inNetWeight == null ? 0 : item.inNetWeight}})
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="出库量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
-              {{ item.goodsName}}({{item.outNetWeight == null ? 0:item.outNetWeight}})
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="应余量（吨）">
-          <template slot-scope="scope">
-            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">{{ item.goodsName}}
-              ({{ item.surplus}})
-              {{item.storage }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="seller" label="出入库" width="300">
-          <template slot-scope="scope">
-            <ws-button class="completed" @click="nocomplete(scope.row)">
-              待完成（{{ scope.row.number }}）
-            </ws-button>
-            <ws-button class="putstorage" @click="warehousing(scope.row)">
-              入库
-            </ws-button>
-            <ws-button class="deliverystorage" v-if="scope.row.clearStatusFlag != 3" @click="delivery(scope.row)">
-              出库
-            </ws-button>
-          </template>
-        </el-table-column>
-      </el-table> -->
+    <el-table
+      ref="table"
+      :data="warehouseList"
+      show-summary
+      :summary-method="getSummaries"
+      style="width: 100%; margin-top: 20px"
+      height="calc(100% - 45px)"
+    >
+      <el-table-column prop="warehouseName" label="仓库名"> </el-table-column>
+      <el-table-column prop="binNumber" label="仓位编号"> </el-table-column>
+      <el-table-column prop="capacity" label="容量（吨）">
+        <template slot-scope="scope">
+          <div
+            v-if="scope.row.capacity != 'null' && scope.row.capacity != null"
+          >
+            {{ scope.row.capacity }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="货名">
+        <template slot-scope="scope">
+          <div
+            style="height: 24px"
+            v-for="(item, i) in scope.row.warehouseNumViewList"
+            :key="i"
+          >
+            {{ item.goodsName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库量（吨）">
+        <template slot-scope="scope">
+          <div
+            style="height: 24px"
+            v-for="(item, i) in scope.row.warehouseNumViewList"
+            :key="i"
+          >
+            {{ item.inNetWeight }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库量（吨）">
+        <template slot-scope="scope">
+          <div
+            style="height: 24px"
+            v-for="(item, i) in scope.row.warehouseNumViewList"
+            :key="i"
+          >
+            {{ item.outNetWeight }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="应余量（吨）">
+        <template slot-scope="scope">
+          <div
+            style="height: 24px"
+            v-for="(item, i) in scope.row.warehouseNumViewList"
+            :key="i"
+          >
+            {{ item.storage }}
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 <script>
-  import {
-    getList,
-    getwarehousetask,
-    export1,
-    editstatus,
-    billoperatehis,
-    getsponsible,
-    clearancee,
-    xiala,
-  } from '@/model/warehouse/index'
-  import {
-    packList,
-  } from '@/model/contarct/index'
-  import {
-    downloadFile
-  } from '@/utils/batchDown'
-  import Pagination from '@/components/Pagination'
-  import WsUpload from '@/components/WsUpload'
-  // import { EventBus } from 'base-core-lib'
-  import {
-    dayjs,
-    EventBus
-  } from 'base-core-lib'
-  export default {
-    name: 'viewSpareMoney',
-    components: {
-      WsUpload,
-      Pagination,
+import {
+  getList,
+  getwarehousetask,
+  export1,
+  editstatus,
+  billoperatehis,
+  getsponsible,
+  clearancee,
+  getWarehouseAll,
+  xiala,
+} from '@/model/warehouse/index'
+import { packList } from '@/model/contarct/index'
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+// import { EventBus } from 'base-core-lib'
+import { dayjs, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
     },
-    watch: {
-      vesselId(val) {
-        this.getList()
-      },
-      isShow(val) {
-        this.showType = val
+  },
+  data() {
+    return {
+      // 年
+      year: '',
+      goodsnameList: [],
+      goodsName: '',
+      warehouseName: '',
+      warehouseName1:'',
+      compId: localStorage.getItem('ws-pf_compId'),
+      warehouseList: [],
+      packtypeList: [], //仓库列表
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
       },
+    }
+  },
+  activated() {
+    this.goodsName = ""
+    this.warehouseName = ""
+    this.getList()
+  },
+  methods: {
+    selectgoodsName(e) {
+      this.getList()
     },
-    data() {
-      return {
-        //弹出框
-        dialogViewSpareMoney: false,
-        dialogApproveFormVisible: false,
-        // 船舶类型
-        monetaryKey: null,
-        // 表格显示数据
-        tableDate: [],
-        list: [],
-        // 是否显示
-        showType: true,
-        // 年
-        year: '',
-        goodsnameList:[],
-        goodsName:'',
-        searchType: 1,
-        searchTypeText: '未完成',
-        searchKeyWord: '',
-        contractType: 2,
-        warehouseType: '1',
-        // 提交类型
-        submitType: true,
-        size: 10,
-        spanArr: [],
-        warehouseName: '',
-        compId: localStorage.getItem('ws-pf_compId'),
-        deptCircularPage: {},
-        warehouseList: [],
-        deptBudgetList: {},
-        historyList: [],
-        deptBudgetTotal: 0,
-        pickerBeginDateBefore: {
-          disabledDate: (time) => {
-            return time.getTime() > Date.now()
-          },
-        },
-        accessoryTFs: false,
-        isShowPrintType: false, //打印
-        headerText: '',
-        packtypeList: [], //仓库列表
-        parameter: {
-          radio: 3,
-          startDate: '',
-          endDate: '',
-          proportion: ''
-        },
-        date: {
-          year: dayjs().format('YYYY'),
-          month: dayjs().format('MM'),
-        },
+    dateFormat(fmt, date) {
+      let ret
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        // "M+": date.getMinutes().toString(),         // 分
+        // "S+": date.getSeconds().toString()          // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
       }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
     },
-    activated() {
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
       this.getList()
-      this.showType = this.isShow
     },
-
-    methods: {
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-          } else if (
-            index === 4 ||
-            index === 5 ||
-            index === 6
-          ) {
-            const values = data.map((item) => {
-              var val = item.warehouseNumViewList.map((items) => {
-                if (column.label == '入库量（吨）') {
-                  return items.inNetWeight
-                } else if (column.label == '出库量（吨）') {
-                  return items.outNetWeight
-                } else if (column.label == '应余量（吨）') {
-                  return items.storage
-                }
-              })
-              return val
-            })
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                if (curr.length > 1) {
-                  var num = 0
-                  for (let i = 0; i < curr.length; i++) {
-                    num += Number(curr[i])
-                  }
-                  return Number(prev) + num
-                } else {
-                  const value = Number(curr)
-                  if (!isNaN(value)) {
-                    return Number(prev) + Number(curr)
-                  } else {
-                    return Number(prev)
-                  }
-                }
-              }, 0)
-            } else {
-              sums[index] = '--'
-            }
-          } else {
-            sums[index] = '--'
-          }
-        })
-        if (typeof sums[4] == 'number') {
-          sums[4] = sums[4].toFixed(3)
-        }
-        if (typeof sums[5] == 'number') {
-          sums[5] = sums[5].toFixed(3)
-        }
-        if (typeof sums[6] == 'number') {
-          sums[6] = sums[6].toFixed(3)
-        }
-        // sums[5]=sums[5].toFixed(2)
-        // sums[6]=sums[6].toFixed(2)
-        // sums[sums.length-7]=sums[sums.length-7].toFixed(2)
-        // sums[sums.length-9]=sums[sums.length-9].toFixed(2)
-        // sums[sums.length-12]=sums[sums.length-12].toFixed(2)
-        // sums[sums.length-13]=sums[sums.length-13].toFixed(2)
-        return sums
-      },
-      
-      
-      getSpanArr(data) {
-        let that = this
-
-        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-
-        that.spanArr = []
-
-        that.pos = 0
-
-        //遍历数据
-
-        data.forEach((item, index) => {
-          //判断是否是第一项
-
-          // if (index === 0) {
-          //   this.spanArr.push(1)
-          //   this.pos = 0
-          // } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            // 查找到符合条件的数据时每次要把之前存储的数据+1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
-            this.spanArr.push(1)
-            this.pos = index
-          }
-          // }
-        })
-      },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    selectpackingMethod(e) {
+      if(this.packtypeList[e].warehouseType == "1"){
+        this.warehouseName = this.packtypeList[e].warehouseName
+      }else if(this.packtypeList[e].warehouseType == "2"){
+         this.warehouseName = this.packtypeList[e].warehouseName1
+      }
       
-      changeradio(e) {
-        this.getList()
-      },
-      selectgoodsName(e){
-        this.getList()
-      },
-      dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加，必须转化成字符串
-        }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
-        }
-        return fmt
-      },
-      handleClose() {
-        this.accessoryTFs = false
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`)
-        this.pageSize = val
-        this.getList()
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val
-        console.log(`当前页: ${val}`)
-        this.getList()
-      },
-      selectpackingMethod(e) {
-     this.getList()
+      this.getList()
+    },
+    returnsales() {
+      this.$router.go(-1)
     },
-      getList() {
-        xiala({
+    getList() {
+      xiala({
         compId: localStorage.getItem('ws-pf_compId'),
-        // warehouseType: this.warehouseType,
       })
         .toPromise()
         .then((response) => {
-          
           this.packtypeList = response
+          for(var i = 0 ; i < response.length ; i++){
+            if(response[i].warehouseType == '2'){
+              response[i].warehouseName1 = response[i].warehouseName
+              response[i].warehouseName = response[i].warehouseName + " (临)"
+            }
+          }
         })
-         // 货名
-        packList({
-            constId: 'CON2'
-          })
-          .toPromise()
-          .then((response) => {
-            this.goodsnameList = response
+      // 货名
+      packList({
+        constId: 'CON2',
+      })
+        .toPromise()
+        .then((response) => {
+          this.goodsnameList = response
+        })
+      // 列表
+      getWarehouseAll({
+        compId: this.compId,
+        warehouseName: this.warehouseName,
+        goodsName: this.goodsName,
+      })
+        .toPromise()
+        .then((response) => {
+          const results = this.makeGroupData(response, function (item) {
+            return [item.binNumberId]
           })
-        getList({
-            compId: localStorage.getItem('ws-pf_compId'),
-            warehouseName: this.warehouseName,
-            goodsName:this.goodsName
-            // warehouseType: this.warehouseType,
+          let _lastList = []
+          for (let i = 0; i < results.length; i++) {
+            let _cw = {}
+            _cw.warehouseName = results[i][0].warehouseName
+            _cw.binNumber = results[i][0].binNumber
+            _cw.capacity = results[i][0].capacity
+            _cw.warehouseNumViewList = results[i]
+            _lastList.push(_cw)
+          }
+          this.warehouseList = _lastList
+        })
+    },
+    makeGroupData(array, fn) {
+      const groups = {}
+      array.forEach(function (item) {
+        const group = JSON.stringify(fn(item))
+        groups[group] = groups[group] || []
+        groups[group].push(item)
+      })
+      return Object.keys(groups).map(function (group) {
+        return groups[group]
+      })
+    },
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+        } else if (index === 4 || index === 5 || index === 6) {
+          const values = data.map((item) => {
+            var val = item.warehouseNumViewList.map((items) => {
+              if (column.label == '入库量（吨）') {
+                return items.inNetWeight
+              } else if (column.label == '出库量（吨）') {
+                return items.outNetWeight
+              } else if (column.label == '应余量（吨）') {
+                return items.storage
+              }
+            })
+            return val
           })
-          .toPromise()
-          .then((response) => {
-            for (let i = 0; i < response.length; i++) {
-              if (response[i].warehouseNumViewList) {
-                for (let q = 0; q < response[i].warehouseNumViewList.length; q++) {
-                  // console.log(response[i].warehouseNumViewList[q])
-                  if (response[i].warehouseNumViewList[q].inNetWeight) {
-                    response[i].warehouseNumViewList[q].inNetWeight = Number(response[i].warehouseNumViewList[q]
-                      .inNetWeight).toFixed(3)
-                  }
-                  if (response[i].warehouseNumViewList[q].outNetWeight) {
-                    response[i].warehouseNumViewList[q].outNetWeight = Number(response[i].warehouseNumViewList[q]
-                      .outNetWeight).toFixed(3)
-                  }
-                  if (response[i].warehouseNumViewList[q].storage) {
-                    response[i].warehouseNumViewList[q].storage = Number(response[i].warehouseNumViewList[q].storage)
-                      .toFixed(3)
-                  }
-                  if (response[i].warehouseNumViewList[q].inNetWeight && response[i].warehouseNumViewList[q]
-                    .outNetWeight) {
-                    response[i].warehouseNumViewList[q].surplus = (response[i].warehouseNumViewList[q].inNetWeight -
-                      response[i].warehouseNumViewList[q].outNetWeight).toFixed(3)
-                  } else if (response[i].warehouseNumViewList[q].inNetWeight) {
-                    response[i].warehouseNumViewList[q].surplus = response[i].warehouseNumViewList[q].inNetWeight
-                  }
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              if (curr.length > 1) {
+                var num = 0
+                for (let i = 0; i < curr.length; i++) {
+                  num += Number(curr[i])
+                }
+                return Number(prev) + num
+              } else {
+                const value = Number(curr)
+                if (!isNaN(value)) {
+                  return Number(prev) + Number(curr)
+                } else {
+                  return Number(prev)
                 }
               }
-
-
-            }
-            this.warehouseList = response
-            this.$nextTick(() => {
-                this.$refs.table.doLayout();
-                // el-table加ref="multipleTable"
-            });
-          })
-        getsponsible({
-            compId: localStorage.getItem('ws-pf_compId')
-          }).toPromise()
-          .then((response) => {
-
-            this.list = response
-            // console.log(response)
-          })
-      },
-      selecttaskType(e) {
-        for (var i = 0; i < this.taskTypeList.length; i++) {
-          if (this.taskTypeList[i].value == e) {
-            this.searchType = this.taskTypeList[i].type
+            }, 0)
+          } else {
+            sums[index] = '--'
           }
+        } else {
+          sums[index] = '--'
         }
-      },
-      // 关闭 dialog时 处理文件url 初始化upload组件
-      handleCloe() {
-        this.dialogViewSpareMoney = false
-      },
-
-      history(row) {
-        billoperatehis({
-            id: row.id
-          })
-          .toPromise()
-          .then((response) => {
-            this.historyList = response
-          })
-      },
-      find() {
-        this.currentPage = 1
-        this.getList()
-      },
-      // async exportlist() {
-      //   const { data } = await postExport(
-      //   this.parameter,
-      //     {},
-      //     { responseType: 'blob' }
-      //   ).toPromise()
-      //   downloadFile({
-      //     res: data,
-      //     fileName: `${
-      //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-      //     }_采购合同1`,
-      //     type: 'xls',
-      //   })
-      // },
+      })
+      if (typeof sums[4] == 'number') {
+        sums[4] = sums[4].toFixed(3)
+      }
+      if (typeof sums[5] == 'number') {
+        sums[5] = sums[5].toFixed(3)
+      }
+      if (typeof sums[6] == 'number') {
+        sums[6] = sums[6].toFixed(3)
+      }
+      return sums
     },
-  }
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .connert {
-    width: 90%;
-    margin: 0 auto;
-  }
-
-  .vertical-text-left {
-    width: 62px;
-    text-align: right;
-  }
-
-  .el-button--primary {
-    background-color: #5878e8;
-    border-color: #5878e8;
-  }
-
-  .el-button--default {
-    color: #8890b1;
-    border-color: #e8eaf1;
-  }
-
-  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
-    width: 30px;
-    margin-left: 0;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-  }
-
-  /deep/.findValue .el-input__inner {
-    border-top-right-radius: 0px;
-    border-bottom-right-radius: 0px;
-  }
-
-  .completed.el-button--default {
-    border-color: #5878e8;
-    background-color: #f6f7fc;
-    color: #5878e8;
-  }
-
-  .putstorage.el-button--default,
-  .deliverystorage.el-button--default {
-    border-color: #8890b1;
-    background-color: #fff;
-    color: #8890b1;
-  }
-
-  /deep/.el-table td,
-  /deep/.el-table th.is-leaf {
-    border-right: 1px solid #e9ecf7;
-    text-align: center;
-  }
-
-  /deep/.el-table tr td:first-child,
-  /deep/.el-table tr th.is-leaf:first-child {
-    border-left: 1px solid #e9ecf7;
-  }
-
-  /deep/.el-table .el-table__header .cell,
-  /deep/.el-table .el-table__body .cell {
-    -webkit-line-clamp: 10;
-    max-height: 400px;
-  }
-
-  .record,
-  .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
-  }
-
-  .record:after {
-    position: absolute;
-    content: '';
-    display: block;
-    top: 5px;
-    right: -2px;
-    width: 1px;
-    height: 12px;
-    background: #e9ecf7;
-  }
-
-  /deep/.el-radio-button:first-child .el-radio-button__inner {
-    margin-left: 10px;
-  }
-
-  //分页
-  .el-pagination {
-    text-align: center;
-    white-space: nowrap;
-    padding: 2px 5px;
-    color: #303133;
-    font-weight: 700;
-    margin-bottom: 20px;
-  }
-
-  .main_css {
-    height: calc(100% - 40px);
-  }
-
-  //打印弹窗
-  .mask {
-    background: black;
-    width: 100vw;
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    z-index: 99;
-    opacity: 0.3;
-  }
-
-  .count {
-    text-align: center;
-    margin-bottom: 10px;
-  }
-
-  .print-type {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    margin: auto;
-    width: 340px;
-    height: 400px;
-    background: white;
-    border-radius: 10px;
-    z-index: 999;
-
-    .bottom-btn {
-      text-align: center;
-    }
-  }
-
-  .print-type-title {
-    text-align: center;
-    font-size: 18px;
-    // margin: 20px;
-    margin: 20px 20px 10px;
-  }
-
-  .print-type-checkbox {
-    padding-left: 20px;
-
-    .el-date-editor.el-input {
-      width: 85% !important;
-    }
-
-    .proportion_css {
-      width: 85%;
-    }
-  }
-
-  .page2-content {
-    border: 1px solid #d8dce6;
-    margin-top: 20px;
-    padding: 10px;
-    box-sizing: border-box;
-    text-align: center;
-    border-radius: 4px;
-    padding-bottom: 20px;
-  }
+/deep/.el-table .el-table__header .cell,
+/deep/.el-table td {
+  text-align: center;
+}
+.title {
+  position: relative;
+}
+
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  top: 16px;
+}
+.top_title {
+  font-size: 20px;
+  font-weight: 600;
+  margin-left: 20px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+
+.bg-bottom {
+  margin: 15px 0px;
+}
+.bg-left,
+.bg-right {
+  background: #f6f7fc;
+  line-height: 60px;
+}
+/deep/.top_select .el-input{
+ width: 220px;
+}
 </style>

src/views/warehousenew/warehouseManagementAdd.vue

@@ -23,6 +23,15 @@
         <!--仓库名称-->
         <ws-form-item label="仓库名称" span="1" prop="warehouseName">
           <ws-input v-model="deptBudgetList.warehouseName" placeholder="请输入仓库名" maxlength="20" size="small" />
+        </ws-form-item>
+          <!--仓库所在地-->
+         <ws-form-item label="仓库所在地" span="1" prop="acceptanceMethod">
+          <el-cascader :options="options_" v-model="selectedOptions" clearable size="large" placeholder="请选择仓库所在地"
+            style="width: 200%" @change="handleChange" />
+        </ws-form-item>
+        <!--详细地址-->
+        <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
+          <ws-input v-model="deptBudgetList.detailedAddress" placeholder="请输入详细地址" maxlength="100" size="small" />
         </ws-form-item>
         <!--负责人-->
         <ws-form-item label="负责人" span="1" prop="personCharge">
@@ -32,33 +41,20 @@
           </el-select>
         </ws-form-item>
         <!--负责人电话-->
-        <ws-form-item label="负责人电话" span="1" prop="personPhone">
+        <!-- <ws-form-item label="负责人电话" span="1" prop="personPhone">
           <ws-input v-model="deptBudgetList.personPhone" placeholder="请输入负责人手机号码" maxlength="100" size="small" />
-        </ws-form-item>
+        </ws-form-item> -->
         <!--其他负责人-->
-        <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
-          <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-            multiple filterable clearable collapse-tags>
-            <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
-              :value="item.staffMobilePhone" />
+        <ws-form-item label="其他驻库人员" span="1" prop="otherPersonCharge" class="addPerson">
+          <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
+            <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select>
         </ws-form-item>
-        <!--仓库所在地-->
-        <ws-form-item label="仓库所在地" span="1" prop="acceptanceMethod">
-          <el-cascader :options="options_" v-model="selectedOptions" clearable size="large" placeholder="请选择仓库所在地"
-            style="width: 200%" @change="handleChange" />
-        </ws-form-item>
-
-        <!--详细地址-->
-        <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
-          <ws-input v-model="deptBudgetList.detailedAddress" placeholder="请输入详细地址" maxlength="100" size="small" />
-        </ws-form-item>
-
         <!--总储量（吨）-->
         <ws-form-item label="总储量（吨）" span="1" prop="settlementMethod" v-show="radio == 1">
           <ws-input class="totalStorage" :readonly="true" v-model="totalStorage" maxlength="100" size="small" />
         </ws-form-item>
-        <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+        <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly radio" style="180px">
           <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
           <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
         </ws-form-item>
@@ -67,13 +63,13 @@
           <ws-form-item label="仓位编号" span="1" prop="contractNo" class="readonly">
             <ws-input v-model="item.binNumber" placeholder="请输入仓位编号" maxlength="20" size="small" />
           </ws-form-item>
-          <ws-form-item label="仓位储量（吨）" span="1" prop="contractNo">
+          <ws-form-item label="容量（吨）" span="1" prop="contractNo">
             <ws-input v-model="item.maxStorage" placeholder="请输入仓位最大容量" maxlength="100" size="small" />
           </ws-form-item>
           <!--备注（选项）-->
-          <ws-form-item label="备注（选填）" span="1" prop="placeDelivery">
+          <!-- <ws-form-item label="备注（选填）" span="1" prop="placeDelivery">
             <ws-input v-model="item.remark" placeholder="请输入备注" maxlength="20" size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
           <img width="22" height="22" class="add" @click="add" src="../../../public/img/add.png" alt="" />
           <img width="22" height="22" class="del" @click="del(index)" src="../../../public/img/del.png" alt="" />
         </div>
@@ -749,9 +745,10 @@
 
   .add,
   .del {
-    position: absolute;
-    right: -38px;
-    top: 9px;
+    // position: absolute;
+    // right: -38px;
+    // top: 9px;
+    margin: 8px;
     cursor: pointer;
   }
 
@@ -1079,6 +1076,7 @@
     font-weight: 400;
     color: #8890b1;
     line-height: 16px;
+    height: auto !important;
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
@@ -1117,4 +1115,10 @@
     margin: 0px 10px;
     border-radius: 3px;
   }
+  .ws-info-table .addPerson{
+    width: 66.666%;
+  }
+  .radio{
+    display: flex;
+  }
 </style>

src/views/warehousenew/warehouseManagementEdit.vue

@@ -25,6 +25,15 @@
               <ws-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
                 :value="item.warehouseName" />
             </ws-select>
+          </ws-form-item>
+            <!--仓库所在地-->
+          <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
+            <el-cascader :options="options_" v-model="selectedOptions" clearable size="large" placeholder="请输入仓库所在地"
+              style="width: 200%" @change="handleChange" />
+          </ws-form-item>
+          <!--详细地址-->
+          <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
+            <ws-input v-model="deptBudgetList.detailedAddress" placeholder="请输入详细地址" maxlength="100" size="small" />
           </ws-form-item>
           <!--负责人-->
           <ws-form-item label="负责人" span="1" prop="personCharge">
@@ -34,50 +43,42 @@
             </el-select>
           </ws-form-item>
           <!--负责人电话-->
-          <ws-form-item label="负责人电话" span="1" prop="personPhone" class="readonly">
+          <!-- <ws-form-item label="负责人电话" span="1" prop="personPhone" class="readonly">
             <ws-input :readonly="true" v-model="deptBudgetList.personPhone" placeholder="请输入负责人电话" maxlength="100"
               size="small" />
-          </ws-form-item>
+          </ws-form-item> -->
           <!--其他负责人-->
-          <ws-form-item label="其他负责人" v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
-            <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-              :filter-method="dataFilter1" filterable clearable multiple collapse-tags>
+          <ws-form-item label="其他驻库人员" v-if="warehouseType == 1" span="1" prop="otherPersonCharge" class="addPerson">
+            <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人" @change="selectstaffOther"
+              :filter-method="dataFilter1" filterable clearable multiple >
               <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
                 :value="item.staffMobilePhone " />
             </el-select>
           </ws-form-item>
-          <!--仓库所在地-->
-          <ws-form-item label="仓库所在地" span="1" prop="warehouseCity">
-            <el-cascader :options="options_" v-model="selectedOptions" clearable size="large" placeholder="请输入仓库所在地"
-              style="width: 200%" @change="handleChange" />
-          </ws-form-item>
-          <!--详细地址-->
-          <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
-            <ws-input v-model="deptBudgetList.detailedAddress" placeholder="请输入详细地址" maxlength="100" size="small" />
-          </ws-form-item>
+        
           <!--总储量（吨)-->
           <ws-form-item v-if="warehouseType == 1" label="总储量（吨)" span="1" prop="totalStorage">
             {{ totalStorage }}
           </ws-form-item>
-          <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly" style="180px">
+          <ws-form-item label="是否自动获取重量" span="1" prop="automaticWeightAcquisition" class="readonly radio " style="180px">
           <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="0">否</el-radio>
           <el-radio v-model="deptBudgetList.automaticWeightAcquisition" label="1">是</el-radio>
         </ws-form-item>
         </ws-info-table>
-        <div v-for="(item, index) in deptBudgetList.warehousePositionInfoList">
+        <div v-for="(item, index) in deptBudgetList.warehousePositionInfoList" :key="index">
           <ws-info-table>
             <!--仓位编号-->
             <ws-form-item label="仓位编号" span="1" prop="binNumber">
               <ws-input v-model="item.binNumber" placeholder="请输入仓位编号" maxlength="100" size="small" />
             </ws-form-item>
             <!--仓位储量（吨）-->
-            <ws-form-item label="仓位储量（吨）" span="1" prop="maxStorage">
+            <ws-form-item label="容量（吨）" span="1" prop="maxStorage">
               <ws-input v-model="item.maxStorage" placeholder="请输入仓位储量（吨）" maxlength="20" size="small" />
             </ws-form-item>
             <!--备注（选填）-->
-            <ws-form-item label="备注（选填）" span="1" prop=" remark">
+            <!-- <ws-form-item label="备注（选填）" span="1" prop=" remark">
               <ws-input v-model="item.remark" placeholder="请输入备注" maxlength="100" size="small" />
-            </ws-form-item>
+            </ws-form-item> -->
             <img width="22" height="22" class="add" @click="add" src="../../../public/img/add.png" alt="" />
             <img width="22" height="22" class="del" @click="del(index, item)" src="../../../public/img/del.png"
               alt="" />
@@ -723,9 +724,10 @@
 
   .add,
   .del {
-    position: absolute;
-    right: -38px;
-    top: 9px;
+    // position: absolute;
+    // right: -38px;
+    // top: 9px;
+    margin: 8px;
     cursor: pointer;
   }
 
@@ -1053,6 +1055,7 @@
     font-weight: 400;
     color: #8890b1;
     line-height: 16px;
+    height: auto !important;
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
@@ -1087,4 +1090,10 @@
     position: absolute;
     right: 0;
   }
+  .ws-info-table .addPerson{
+    width: 66.666%;
+  }
+  .radio{
+    display: flex;
+  }
 </style>

src/views/warehousenew/warehouseManagementIoss.vue

@@ -2,7 +2,7 @@
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">&nbsp;&nbsp;盘损当期仓损</h2>
+        <h2 class="bg-left title">&nbsp;&nbsp;盘点当期盈亏</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button
@@ -21,11 +21,15 @@
       </el-col>
     </el-row>
     <div class="center">
-      <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
-        <h2>
-          {{ this.$route.query.warehouseName }}
-          <span class="position"> {{ this.$route.query.binNumber }}仓位 </span>
-        </h2>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList.deptBudgetList" :rules="rules">
+        <div class="topInfo">
+           <span class="warehousetitle"> {{ this.$route.query.warehouseName }} </span>
+           <span class="binNo">仓位号：</span>
+        	<el-select filterable clearable v-model="deptBudgetList.binNumber" placeholder="请选择仓位" class="typeselect" @change="binNumberChange">
+              <el-option v-for="(item,index) in binnumberList" :key="item.binNumber" :label="item.binNumber" :value="index" />
+          </el-select>
+        </div>
+       
         <!-- 货名 -->
         <ws-form-item
           label="货名："
@@ -47,6 +51,7 @@
             />
           </ws-select>
         </ws-form-item>
+        
         <!--当期累计入库量-->
         <ws-form-item
           label="当期累计入库量（吨）："
@@ -56,20 +61,21 @@
         >
           {{ deptBudgetList.cumulativeStockIn }}
         </ws-form-item>
+
         <!--实际库存（吨）-->
-        <ws-form-item
+        <el-form-item
           label="实际库存（吨）："
           span="1"
           prop="physicalInventory"
           class="readonly"
         >
-          <ws-input
+          <el-input
             v-model="deptBudgetList.physicalInventory"
             placeholder=""
             maxlength="100"
             size="small"
           />
-        </ws-form-item>
+        </el-form-item>
         <!--当期累计出库量（吨）-->
         <ws-form-item
           label="当期累计出库量（吨）："
@@ -130,7 +136,7 @@
   </div>
 </template>
 <script>
-import { goodsname, ioss, submitioss } from '@/model/warehouse/index'
+import { goodsname, ioss, submitioss,getbinnumber } from '@/model/warehouse/index'
 
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -207,6 +213,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      binnumberList:[],
     }
   },
   computed: {
@@ -269,6 +276,13 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    binNumberChange(e){
+      debugger
+       this.deptBudgetList.positionId = this.binnumberList[e].id
+       this.deptBudgetList.binNumber = this.binnumberList[e].binNumber
+       this.deptBudgetList1.binNumber = this.binnumberList[e].binNumber
+       this.deptBudgetList1.baseId = this.binnumberList[e].id
+    },
     //返回按钮
     returnWarehouse() {
       this.deptBudgetList = {}
@@ -425,6 +439,10 @@ export default {
         .then((response) => {
           this.goodnameList = response
         })
+        getbinnumber({id: this.deptBudgetList.baseId}).toPromise()
+						.then((response) => {
+							this.binnumberList = response.warehousePositionInfoList
+						})
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
@@ -446,9 +464,7 @@ export default {
   height: 700px;
   margin: 0 auto;
 }
-/deep/.el-form-item__label {
-  width: 160px;
-}
+
 /deep/.el-input--small {
   width: 70%;
 }
@@ -470,17 +486,15 @@ export default {
   display: inline-grid;
   padding: 2px 4px;
 }
-//表格
+// //表格
 .readonly {
   width: 49%;
   display: inline-flex;
   height: 40px;
 }
 /deep/.el-form-item__label {
-  width: 170px;
   text-align: left;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
   color: #8890b1;
   line-height: 16px;
@@ -521,4 +535,17 @@ export default {
   position: absolute;
   left: 0;
 }
+.topInfo{
+  display: flex;
+  margin: 20px 0;
+  .warehousetitle{
+    font-size: 24px;
+    font-weight: 600;
+  }
+  .binNo{
+    color: #8890b1;
+    margin: 6px 10px 0px 22px;
+  }
+}
+
 </style>