前端sdy

src/api/V2/warehouse/index.js

@@ -8,9 +8,9 @@ export const API_GET_WAREHOUSE_CUSTOMDROPDOWN = '/warehouseBaseInfo/selectWareho
 //删除
 export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 //删除仓库列表
-export const API_GET_WAREHOUSE_DELETELIST ='/warehouseBaseInfo/selectAllWarehouse'
+export const API_GET_WAREHOUSE_DELETELIST = '/warehouseBaseInfo/selectAllWarehouse'
 //隐藏
-export const API_POST_WAREHOUSE_HIDE ='/warehouseBaseInfo/api/editShow'
+export const API_POST_WAREHOUSE_HIDE = '/warehouseBaseInfo/api/editShow'
 
 
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
@@ -25,12 +25,13 @@ export const API_GET_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGoods
 // 货名等下拉
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`
 // 入库添加
-export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse `
 
+export const API_POST_STORAGE_PUT = `/warehouseInOutInfo/InOutWarehouse`
+//流转记录
+export const API_GET_SELECT_INFO = `/warehouseInOutInfo/selectInfo`
+// 盘损记录
+export const API_GET_WAREHOUSE_INVENTORYCOUNT = '/warehouseInventoryCountInfo/selectInfo'
 //盘损提交
 export const API_POST_STORAGE_IOSS = '/warehouseInventoryCountInfo/addInventory'
-
-
 //待完善记录
 export const API_GET_WAREHOUSE_COMPLETE = '/warehouseInOutInfo/selectWarehouseInOutInfo'
-

src/components/mapdrag/mapdrag.vue

@@ -1,7 +1,7 @@
 <style lang='scss' scoped>
 .mapContent {
   position: relative;
-  margin-top: 40px;
+  margin-top: 64px;
 }
 #mapContainer {
   width: 300px;
@@ -28,6 +28,14 @@
     resize: none;
   }
 }
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-button--default {
+  color: #5878e8;
+  border-color: #5473e8;
+}
 </style>
 
 <template>
@@ -61,13 +69,15 @@
         >
         </el-option>
       </el-select>
-      <el-input
+      <!-- <el-input
         type="textarea"
         id="searchValue"
         placeholder="地址"
         v-model="address"
         clearable
-      ></el-input>
+      ></el-input> -->
+      <el-button @click="positions" type="primary">确定定位</el-button>
+      <el-button @click="anewselect">重新选择</el-button>
     </div>
   </div>
 </template>
@@ -89,6 +99,9 @@ export default {
       address: '',
       objPoint: [],
       markers: [],
+      zoomEnable: true,
+      dragEnable: true,
+      status: true,
     }
   },
   props: ['flagVisible', 'position'],
@@ -114,16 +127,20 @@ export default {
       this.map = new AMap.Map('mapContainer', {
         resizeEnable: true,
         zoom: 10,
+        zoomEnable: this.zoomEnable,
+        dragEnable: this.dragEnable,
       })
       this.map.on('click', function (e) {
-        var marker = new AMap.Marker({
-          position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
-        })
-        that.map.remove(that.markers)
-        that.$emit('marker', e)
-        that.markers.push(marker)
-        // 将创建的点标记添加到已有的地图实例：
-        that.map.add(marker)
+        if (this.status) {
+          var marker = new AMap.Marker({
+            position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat.getLat()), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+          })
+          that.map.remove(that.markers)
+          that.$emit('marker', e)
+          that.markers.push(marker)
+          // 将创建的点标记添加到已有的地图实例：
+          that.map.add(marker)
+        }
       })
       this.marker = new AMap.Marker({
         icon: new AMap.Icon({
@@ -150,7 +167,6 @@ export default {
             that.marker.setPosition(e.poi.location)
             placeSearch.search() // 关键字查询查询
             geocoder.getAddress(e.poi.location, function (status, result) {
-              console.log(status)
               if (status === 'complete') {
                 var obj = {}
                 that.province = result.regeocode.addressComponent.province
@@ -221,6 +237,24 @@ export default {
     this.loadmap()
   },
   methods: {
+    positions() {
+      this.status = false
+      var status = {
+        zoomEnable: false,
+        dragEnable: false,
+      }
+      this.map.setStatus(status)
+      this.loadmap()
+    },
+    anewselect() {
+      this.status = true
+      var status = {
+        zoomEnable: true,
+        dragEnable: true,
+      }
+      this.map.setStatus(status)
+      this.loadmap()
+    },
     loadmap(val) {
       let params = val
       var that = this // 插件
@@ -278,16 +312,22 @@ export default {
       })
     },
     selectP(val) {
-      this.loadmap(val)
-      this.city = ''
-      this.district = ''
+      if (this.status) {
+        this.loadmap(val)
+        this.city = ''
+        this.district = ''
+      }
     },
     selectC(val) {
-      this.loadmap(val)
-      this.district = ''
+      if (this.status) {
+        this.loadmap(val)
+        this.district = ''
+      }
     },
     selectD(val) {
-      this.loadmap(val)
+      if (this.status) {
+        this.loadmap(val)
+      }
     },
   },
 }

src/model/warehouse/index.js

@@ -8,15 +8,15 @@ import {
     API_POST_WAREHOUSE_DELETE,
     API_GET_WAREHOUSE_DELETELIST,
     API_POST_WAREHOUSE_HIDE,
-    // API_GET_WAREHOUSE_DELETE,
     API_POST_WAREHOUSE_EDIT,
     API_GET_WAREHOUSE_IOSS,
     API_GET_WAREHOUSE_NAME,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
     API_POST_STORAGE_PUT,
+    API_GET_SELECT_INFO,
+    API_GET_WAREHOUSE_INVENTORYCOUNT,
     API_POST_STORAGE_IOSS,
-     API_GET_WAREHOUSE_COMPLETE,
-
+    API_GET_WAREHOUSE_COMPLETE,
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -25,7 +25,7 @@ export const addList = appRx.post(API_POST_ADD_WAREHOUSE_BASEINFO, errorCatcher,
 //仓库查看
 export const getLook = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHandle, filter)
 //仓库下拉
-export const xiala = appRx.get( API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
+export const xiala = appRx.get(API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 //删除
 
 export const deletewarehouse = appRx.post(API_POST_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
@@ -33,7 +33,6 @@ export const deletewarehouse = appRx.post(API_POST_WAREHOUSE_DELETE, errorCatche
 export const delectlist = appRx.get(API_GET_WAREHOUSE_DELETELIST, errorCatcher, errorHandle, filter)
 //隐藏
 export const hide = appRx.post(API_POST_WAREHOUSE_HIDE, errorCatcher, errorHandle, filter)
-
 //仓库编辑
 export const edit = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
 //盘损
@@ -44,9 +43,12 @@ export const goodsname = appRx.get(API_GET_WAREHOUSE_NAME, errorCatcher, errorHa
 export const pullDown = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 // 入库添加
 export const addstorageputList = appRx.post(API_POST_STORAGE_PUT, errorCatcher, errorHandle, filter)
+// 流转记录
+export const addselectinfoList = appRx.get(API_GET_SELECT_INFO, errorCatcher, errorHandle, filter)
+// 盘损记录
+export const adjustmentrecordList = appRx.get(API_GET_WAREHOUSE_INVENTORYCOUNT, errorCatcher, errorHandle, filter)
 //盘损提交
 export const submitioss = appRx.post(API_POST_STORAGE_IOSS, errorCatcher, errorHandle, filter)
 //待完善记录
 export const complete = appRx.get(API_GET_WAREHOUSE_COMPLETE, errorCatcher, errorHandle, filter)
 
-

src/views/warehouse/warehouseManagementAdd.vue

@@ -25,17 +25,12 @@ npm install vue-amap --save// 仓库添加
     <ws-form
       class="position"
       ref="deptBudgetList"
-      :rules="mainReportAdd"
+      :rules="rules"
       :model="deptBudgetList"
-    >
+      ><div class="small-title">基本信息</div>
       <ws-info-table>
         <!--仓库名称-->
-        <ws-form-item
-          label="仓库名称"
-          span="1"
-          prop="contractNo"
-          class="readonly"
-        >
+        <ws-form-item label="仓库名称" span="1" prop="warehouseName">
           <ws-input
             v-model="deptBudgetList.warehouseName"
             placeholder="请输入仓库名"
@@ -44,7 +39,12 @@ npm install vue-amap --save// 仓库添加
           />
         </ws-form-item>
         <!--负责人-->
-        <ws-form-item label="负责人" span="1" prop="buyer" class="readonly">
+        <ws-form-item
+          label="负责人"
+          span="1"
+          prop="personCharge"
+          class="readonly"
+        >
           <ws-input
             v-model="deptBudgetList.personCharge"
             placeholder="请输入负责人姓名"
@@ -54,7 +54,7 @@ npm install vue-amap --save// 仓库添加
         </ws-form-item>
 
         <!--负责人电话-->
-        <ws-form-item label="负责人电话" span="1" prop="shippingType">
+        <ws-form-item label="负责人电话" span="1" prop="personPhone">
           <ws-input
             v-model="deptBudgetList.personPhone"
             placeholder="请输入负责人手机号码"
@@ -70,7 +70,7 @@ npm install vue-amap --save// 仓库添加
             v-model="selectedOptions"
             clearable
             size="large"
-            placeholder="请选择交货地"
+            placeholder="请选择仓库所在地"
             style="width: 200%"
             @change="handleChange"
           />
@@ -94,6 +94,7 @@ npm install vue-amap --save// 仓库添加
         <!--总吨量（吨）-->
         <ws-form-item label="总吨量（吨）" span="1" prop="settlementMethod">
           <ws-input
+            class="totalStorage"
             :readonly="true"
             v-model="totalStorage"
             maxlength="100"
@@ -106,14 +107,14 @@ npm install vue-amap --save// 仓库添加
           v-for="(item, index) in freightspace"
         >
           <ws-form-item
-            label="仓库编号"
+            label="仓位编号"
             span="1"
             prop="contractNo"
             class="readonly"
           >
             <ws-input
               v-model="item.binNumber"
-              placeholder="请输入仓库编号"
+              placeholder="请输入仓位编号"
               maxlength="20"
               size="small"
             />
@@ -131,7 +132,7 @@ npm install vue-amap --save// 仓库添加
             <ws-input
               v-model="item.remark"
               placeholder="请输入交货地"
-              maxlength="100"
+              maxlength="20"
               size="small"
             />
           </ws-form-item>
@@ -155,6 +156,7 @@ npm install vue-amap --save// 仓库添加
       </ws-info-table>
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
+      <div class="small-title">上传仓库照片</div>
       <ws-upload
         ref="upload"
         table-name="maintain_work_order"
@@ -167,9 +169,9 @@ npm install vue-amap --save// 仓库添加
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
+      <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
+      <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
     </ws-form>
-    <!-- <ws-button @click="exportlist()"></ws-button> -->
-    <map-drag @marker="marker" @selectedAddress="selectedAddress" class="position"></map-drag>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -186,12 +188,7 @@ npm install vue-amap --save// 仓库添加
 //  import { getVesselOne } from '@/model/procurement/basic'
 //  import { dayjs } from 'base-core-lib'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {
-  addList,
-  addxiala,
-  editxiala,
-  delxiala,
-} from '@/model/warehouse/index'
+import { addList, addxiala, editxiala, delxiala } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -243,13 +240,28 @@ export default {
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
-      mainReportAdd: {},
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
       appendixIdsAdd: '',
       size: 10,
       value1: '',
       unitList: [],
       freightspace: [{ binNumber: '', maxStorage: '', remark: '' }],
       name: '',
+      list: [],
     }
   },
   activated() {},
@@ -295,7 +307,7 @@ export default {
       this.selectedOptions = value
     },
     returnsales() {
-      this.$router.push({ path: 'purchaseContract' })
+      this.$router.push({ path: 'warehouseManagementList' })
     },
     // confirmPosition() {
     //   this.draggable = false
@@ -319,30 +331,102 @@ export default {
     },
 
     submit() {
-      console.log(this.freightspace)
-
-      this.$refs.deptBudgetList.validate((valid) => {
-        if (valid) {
-          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.warehousePrivate =
-            CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.warehouseCity =
-            CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.warehouseArea =
-            CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.warehousePositionInfoList = this.freightspace
-          this.deptBudgetList.totalStorage = this.totalStorage
-          addList(this.deptBudgetList)
-            .toPromise()
-            .then((response) => {
-              this.$message.success('添加成功')
-              this.$router.push({ path: 'warehouseManagementList' })
+      console.log(this.deptBudgetList)
+      if (!this.deptBudgetList.warehouseName) {
+        this.$message({
+          message: '仓库名称不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.warehouseName.length < 2 ||
+        this.deptBudgetList.warehouseName.length > 20
+      ) {
+        this.$message({
+          message: '仓库名称长度不符合要求，请控制在2-20字符之内',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.personCharge.length < 2 ||
+        this.deptBudgetList.personCharge.length > 10
+      ) {
+        this.$message({
+          message: '负责人长度不符合要求，请控制在2-10字符之内',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.personPhone.length > 11) {
+        this.$message({
+          message: '手机号输入有误',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.detailedAddress.length < 2 ||
+        this.deptBudgetList.detailedAddress.length > 20
+      ) {
+        this.$message({
+          message: '详细地址长度不符合要求，请控制在2-20字符之内',
+          type: 'warning',
+        })
+        return
+      }
+      for (var i = 0; i < this.freightspace.length; i++) {
+        for (var j = i + 1; j < this.freightspace.length; j++) {
+          console.log(
+            this.freightspace[i].binNumber,
+            this.freightspace[j].binNumber
+          )
+          if (
+            this.freightspace[i].binNumber == this.freightspace[j].binNumber
+          ) {
+            this.$message({
+              message: '仓位编号重复',
+              type: 'warning',
             })
-        } else {
-          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          return false
+            return
+          }
         }
+      }
+      this.$confirm(`确定提交仓库信息？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
       })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
+              this.deptBudgetList.warehousePrivate =
+                CodeToText[this.selectedOptions[0]]
+              this.deptBudgetList.warehouseCity =
+                CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.warehouseArea =
+                CodeToText[this.selectedOptions[2]]
+              this.deptBudgetList.warehousePositionInfoList = this.freightspace
+              this.deptBudgetList.totalStorage = this.totalStorage
+              addList(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.$router.push({ path: 'warehouseManagementList' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
@@ -467,6 +551,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
 .position {
   position: relative;
 }
@@ -488,8 +590,8 @@ export default {
   padding: 0 15%;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #cdd2dc;
-  border-bottom: 1px solid #cdd2dc;
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
 }
 .readonly {
   position: relative;
@@ -515,6 +617,10 @@ export default {
   position: absolute;
   left: 0;
 }
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;
@@ -524,13 +630,13 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   padding: 0 25px;
-  border-left: 1px solid #cdd2dc;
-  background: #fafbfc;
+  border-left: 1px solid transparent;
+  background: #fff;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 140px;
+  width: 100px;
   text-align: center;
-  background: #f0f2f6;
+  background: #fff;
   // border: 1px solid #cdd2dc;
 }
 .button-container {
@@ -691,9 +797,6 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 130px;
-}
 .ws-info-table .el-form-item {
   width: 33.3333%;
 }
@@ -713,45 +816,45 @@ export default {
   width: 33.33%;
 }
 //去边框
-/deep/.el-form-item{
-    border-right:0px; 
-   border-bottom: 0px;
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
 }
-/deep/.ws-info-table{
-border-left: 0px; 
-     border-top: 0px;
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
 }
-.ws-info-table .el-form-item .el-form-item__content{
-   border-right:0px; 
-   border-bottom: 0px;
-   border-left: 0px; 
-     border-top: 0px;
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right:0px; 
-   border-bottom: 0px;
-   border-left: 0px; 
-     border-top: 0px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content{
-background: #F5F7FA;
-border-radius: 4px;
-border: 1px solid #D8DCE6;
-font-family: PingFangSC-Regular, PingFang SC;
-margin-bottom: 5px;
- background-color: #fff;
- font-size: 14px;
- font-weight: 400;
-color: #8890B1;
-line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label{
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #8890B1;
- line-height: 16px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__content {

src/views/warehouse/warehouseManagementDelete.vue

@@ -1,12 +1,17 @@
 //删除仓库
 <template>
+
   <div class="homepage"> 
      <el-row>
+
+  <div>
+    <el-row>
+
       <el-col :span="20">
         <h2 class="bg-left title">删除库房</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-         <el-button
+        <el-button
           class="bg-bottom"
           type="primary"
           size="small"
@@ -17,51 +22,49 @@
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
             alt=""
-          />返回</el-button>
+          />返回</el-button
+        >
       </el-col>
     </el-row>
-   <div class="connert">
+    <div class="connert">
       <el-table
         class="wenzi"
         :data="warehouseList"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-         <el-table-column type="index" label="序号" >
-        <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="仓库名称" >
+        <el-table-column type="index" label="序号">
+          <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="仓库名称">
         </el-table-column>
-        <el-table-column prop="warehouseLocation" label="仓库所在地" >
+        <el-table-column prop="warehouseLocation" label="仓库所在地">
         </el-table-column>
-        <el-table-column prop="nowStorage" label="应余库存（吨）"> </el-table-column>
-        <el-table-column prop="personCharge;" label="负责人">
+        <el-table-column prop="nowStorage" label="应余库存（吨）">
         </el-table-column>
-       
-        
+        <el-table-column prop="personCharge;" label="负责人"> </el-table-column>
+
         <el-table-column prop="address" label="操作" width="200">
-          <template slot-scope="scope" >
+          <template slot-scope="scope">
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
               v-hasPermission="
-             
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
               "
-              v-if="scope.row.showFlag==0"
+              v-if="scope.row.showFlag == 0"
               >显示</ws-button
             >
             <ws-button
               type="primary"
               @click="handleHide(scope.row)"
               v-hasPermission="
-             
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
               "
-              v-if="scope.row.showFlag==1"
+              v-if="scope.row.showFlag == 1"
               >隐藏</ws-button
             >
             <ws-button
@@ -75,13 +78,11 @@
           </template>
         </el-table-column>
       </el-table>
-      
     </div>
   </div>
 </template>
 <script>
-
-import{
+import {
   getList,
   delectlist,
   deletewarehouse,
@@ -107,7 +108,7 @@ export default {
   },
   data() {
     return {
-      isshow:false,
+      isshow: false,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -127,9 +128,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      warehouseList:[],
-      scope:[],
-      show:'隐藏',
+      warehouseList: [],
+      scope: [],
+      show: '隐藏',
       // 提交类型
       submitType: true,
       size: 10,
@@ -151,16 +152,16 @@ export default {
     }
   },
   activated() {
-  this.getList()
+    this.getList()
     this.showType = this.isShow
   },
   methods: {
-    returnWarehouse(){
+    returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    
+
     //列表
-     getList() {
+    getList() {
       delectlist({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
@@ -180,110 +181,345 @@ export default {
       this.dialogViewSpareMoney = false
     },
     //隐藏
-    handleHide(row) { 
-      if(row.showFlag==1){
+    handleHide(row) {
+      if (row.showFlag == 1) {
         this.$confirm(`隐藏后将对其他用户不可见，是否确认隐藏`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-        hide({ id: row.id})
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '隐藏成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // console.log(3333)
-             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
         })
-      }else{
-        hide({ id: row.id})
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '显示成功',
+          .then(() => {
+            hide({ id: row.id })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '隐藏成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // console.log(3333)
-             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              .catch((response) => {
+                // console.log(3333)
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      } else {
+        hide({ id: row.id })
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '显示成功',
             })
+            this.getList()
+          })
+          .catch((response) => {
+            // console.log(3333)
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
       }
-    }   
     },
-    handleDelete(row) {
-      // console.log(row)
-      this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-        deletewarehouse({ id: row.id})
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // console.log(3333)
-             // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+  },
+  handleDelete(row) {
+    // console.log(row)
+    this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
+      cancelButtonText: '取消',
+      confirmButtonText: '确定',
+      type: 'warning',
+    })
+      .then(() => {
+        deletewarehouse({ id: row.id })
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '删除成功',
             })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-    delectlist(){},
-    deletewarehouse(){},
-    }
+            this.getList()
+          })
+          .catch((response) => {
+            // console.log(3333)
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          })
+      })
+      .catch(() => {
+        return false
+      })
+  },
+  // deletecontract(){},
+  //删除
+  approve() {},
+  listQuery() {},
+  total() {},
+  clearfiltQuery() {},
+  selectCrtDuty() {},
+  delectlist() {},
+  deletewarehouse() {},
+}
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.add,
+.del {
+  position: absolute;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
+}
+.del {
+  right: -70px;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.el-table .el-table__header .cell,
+/deep/.el-table .el-table__body .cell {
+  text-align: center;
 }
-.vertical-text-left {
-  width: 62px;
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
   text-align: right;
 }
-.bg-right{
-  float: right;
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
 }
-.homepage{
-  padding: 0 20px;
+.wenzi p {
+  display: inline-block;
 }
-.bg-right{
-text-align: right;
-  margin: 15px 0;
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
 }
-//表格文字居中
-/deep/.el-table th.is-leaf,/deep/.el-table td {
-    text-align: center;
+.el-form-item__label {
+  text-align: center;
 }
-//表格数据文字
- /deep/.el-table .el-table__body .cell{
-   font-size: 14px;
- } 
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+.ws-info-table .el-form-item {
+  width: 33.33%;
+}
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+
+// .connert {
+//   padding: 10px 40px;
+// }
+// .bg-right{
+// text-align: right;
+//   margin: 15px 0;
+// }
+// //表格文字居中
+// /deep/.el-table th.is-leaf,/deep/.el-table td {
+//     text-align: center;
+// }
+// //表格数据文字
+//  /deep/.el-table .el-table__body .cell{
+//    font-size: 14px;
+//  } 
 </style>

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1,9 +1,9 @@
-// 入库登记
+// 出库登记
 <template>
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">入库登记</h2>
+        <h2 class="bg-left title">出库登记</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button
@@ -238,6 +238,17 @@
           class="bg-bottom-up"
           type="primary"
           size="small"
+<<<<<<< HEAD
+          @click="returnWarehouse()"
+=======
+          @click="temporaryStorage()"
+>>>>>>> 41d88bb42d0ea473ee1ccee04976060fbd8bbb5d
+          >暂存</el-button
+        >
+        <el-button
+          class="bg-bottom-up"
+          type="primary"
+          size="small"
           @click="submit()"
           >提交</el-button
         >
@@ -349,12 +360,61 @@ export default {
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
+    temporaryStorage() {
+      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
+              this.deptBudgetList.inOutFlag = 1
+              this.deptBudgetList.statusFlag = 1
+              addstorageputList(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('暂存成功')
+                  this.$router.push({ path: 'warehouseManagementList' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     //提交按钮
     submit() {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.inOutFlag = 1
+          this.deptBudgetList.statusFlag = 3
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    //暂存按钮
+    returnWarehouse() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
           addstorageputList(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -429,7 +489,7 @@ export default {
           this.gradeList = response
         })
       // 类型
-      pullDown({ constId: 'CON5' })
+      pullDown({ constId: 'CON6' })
         .toPromise()
         .then((response) => {
           this.storageType = response

src/views/warehouse/warehouseManagementEdit.vue

@@ -14,8 +14,9 @@
         >
       </el-col>
     </el-row>
-    <div class="center">
+    <div>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="small-title">基本信息</div>
         <!--基本信息-->
         <ws-info-table>
           <!--仓库名称-->
@@ -49,7 +50,12 @@
             />
           </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
               v-model="deptBudgetList.personPhone"
               placeholder="请输入负责人电话"
@@ -122,6 +128,27 @@
           </ws-info-table>
         </div>
       </ws-form>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="small-title">上传仓库照片</div>
+        <ws-upload
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
+        <div class="small-title">仓库定位</div>
+        <map-drag
+          @marker="marker"
+          @selectedAddress="selectedAddress"
+        ></map-drag>
+      </ws-form>
+      <!-- <ws-button @click="exportlist()"></ws-button> -->
     </div>
     <div style="text-align: right; padding: 10px">
       <el-button
@@ -139,12 +166,14 @@ import { xiala, billoperatehis, getLook, edit } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
     Pagination,
+    mapDrag,
   },
   watch: {
     vesselId(val) {
@@ -189,7 +218,7 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-
+      appendixIdsAdd: '',
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -207,27 +236,29 @@ export default {
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    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
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
+    onChange(files) {
+      this.fileNum = files
+      this.$refs.upload.handleSaveBill().then((res) => {
+        console.log(files)
+      })
     },
     handleClose() {
       this.accessoryTFs = false
@@ -308,7 +339,7 @@ export default {
         }
       })
     },
-   
+
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -332,28 +363,313 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.center {
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
   position: relative;
-  margin-top: 100px;
-  top: 100px;
-  width: 90%;
-  height: 500px;
-  margin: 0 auto;
+  padding: 10px;
 }
-.container .bg-left {
-  margin-left: 40px;
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
 }
-.container .bg-bottom {
+.position {
+  position: relative;
+}
+.add,
+.del {
   position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+  right: -38px;
+  top: 9px;
+  cursor: pointer;
+}
+.del {
+  right: -70px;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
 }
-.vertical-text-left {
-  width: 62px;
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
   text-align: right;
 }
-/deep/.el-form-item {
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+.ws-info-table .el-form-item {
   width: 33.33%;
 }
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
 </style>

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -1,7 +1,7 @@
 <!--仓库管理-->
 <template>
   <div class="container">
-     <el-row>
+    <el-row>
       <el-col :span="20">
         <h2 class="bg-left title">盘损详情</h2>
       </el-col>
@@ -16,49 +16,38 @@
       </el-col>
     </el-row>
     <div class="connert">
-      <h2>鲅鱼圈一号库  102仓位</h2>
+      <h2>鲅鱼圈一号库 102仓位</h2>
       <el-table
         class="wenzi"
         :data="contractList.records"
         style="width: 100%; margin-top: 20px"
         height="780"
       >
-      <el-table-column type="index" label="序号">
-        <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="contractNo" label="货名" >
+        <el-table-column type="index" label="序号">
+          <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="goodsName" label="当前累计入库（吨）" >
+        <el-table-column prop="contractNo" label="货名"> </el-table-column>
+        <el-table-column prop="goodsName" label="当前累计入库（吨）">
         </el-table-column>
         <el-table-column prop="weight" label="当前累计出库（吨）">
-         </el-table-column>
+        </el-table-column>
         <el-table-column prop="unitContractPrice" label="应余库存">
         </el-table-column>
         <el-table-column prop="packingMethod" label="实际库存（吨）">
         </el-table-column>
-        <el-table-column prop="buyer" label="损耗量（吨）"> 
-        </el-table-column>
-        <el-table-column prop="seller" label="库损比例（‰）">
-         </el-table-column>
-         <el-table-column prop="seller" label="内勤" >
-         </el-table-column>
-          <el-table-column prop="seller" label="录入时间" >
-         </el-table-column>
+        <el-table-column prop="buyer" label="损耗量（吨）"> </el-table-column>
+        <el-table-column prop="seller" label="库损比例（‰）"> </el-table-column>
+        <el-table-column prop="seller" label="内勤"> </el-table-column>
+        <el-table-column prop="seller" label="录入时间"> </el-table-column>
       </el-table>
-      
     </div>
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/contarct/index'
+import { adjustmentrecordList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -94,9 +83,9 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
-       searchTypeText: '未完成',
-       searchKeyWord: '',
+      searchType: '',
+      searchTypeText: '未完成',
+      searchKeyWord: '',
       contractType: 2,
       startDate: null,
       endDate: null,
@@ -124,10 +113,16 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
+    this.deptBudgetList.baseId = this.$route.query.baseId
+    this.deptBudgetList.positionId = this.$route.query.positionId
+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
     this.getList()
     this.showType = this.isShow
   },
   methods: {
+    returnWarehouse() {
+      this.$router.go(-1)
+    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -164,16 +159,14 @@ export default {
       this.getList()
     },
     getList() {
-      getList({
+      adjustmentrecordList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
+        baseId: this.deptBudgetList.baseId,
+        positionId: this.deptBudgetList.positionId,
+        warehouseName: this.deptBudgetList.warehouseName,
+        searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
       })
         .toPromise()
         .then((response) => {
@@ -312,6 +305,4 @@ export default {
   width: 62px;
   text-align: right;
 }
-
-
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -5,22 +5,27 @@
       <template slot="left">
         <ws-button
           type="primary"
-          @click="handleLook()"
+          @click="handleAdd()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
-          >查看</ws-button
+          ><img
+            width="11"
+            height="11"
+            style="position: relative; top: 1px"
+            src="../../../public/img/header-add.png"
+            alt=""
+          />
+          添加</ws-button
         >
         <ws-button
-          type="primary"
-          @click="handleAdd()"
+          @click="handleLook()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
-          >添加</ws-button
+          >查看</ws-button
         >
         <ws-button
-          type="primary"
           @click="handleEdit()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -28,7 +33,6 @@
           >编辑</ws-button
         >
         <ws-button
-          type="primary"
           @click="handleDelete()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -38,7 +42,7 @@
       </template>
       <template slot="right">
         <ws-input
-          v-model="searchKeyWord"
+          v-model="warehouseName"
           placeholder="请输入仓库名"
           clearable
           maxlength="500"
@@ -67,7 +71,7 @@
         /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div class="connert">
+    <div>
       <el-table
         class="wenzi"
         :data="warehouseList"
@@ -87,30 +91,42 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="品种">
+        <el-table-column class="table_td" label="品种">
           <template slot-scope="scope">
-            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
               {{ item.goodsName }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="入库量（吨）">
+        <el-table-column class="table_td" label="入库量（吨）">
           <template slot-scope="scope">
-            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
               {{ item.inNetWeight }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="出库量（吨）">
+        <el-table-column class="table_td" label="出库量（吨）">
           <template slot-scope="scope">
-            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
               {{ item.outNetWeight }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="应余量（吨）">
+        <el-table-column class="table_td" label="应余量（吨）">
           <template slot-scope="scope">
-            <div v-for="(item, i) in scope.row.warehouseNumViewList">
+            <div
+              style="height: 24px"
+              v-for="(item, i) in scope.row.warehouseNumViewList"
+            >
               {{ item.storage }}
             </div>
           </template>
@@ -118,7 +134,7 @@
         <el-table-column prop="seller" label="出入库" width="300">
           <template slot-scope="scope">
             <ws-button
-              type="primary"
+              class="completed"
               @click="nocomplete(scope.row)"
               v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -127,7 +143,7 @@
               待完成（{{ scope.row.number }}）
             </ws-button>
             <ws-button
-              type="primary"
+              class="putstorage"
               @click="warehousing(scope.row)"
               v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -136,7 +152,7 @@
               入库
             </ws-button>
             <ws-button
-              type="primary"
+              class="deliverystorage"
               @click="delivery(scope.row)"
               v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
@@ -146,26 +162,11 @@
             </ws-button>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="操作" width="200" >
-         <template slot-scope="scope"> 
-          <ws-button
-            type="primary"
-            @click="record()"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >记录</ws-button
-          >
-
-          <ws-button
-            type="primary"
-            @click="loss(scope.row)"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >盘损</ws-button
-          >
-          </template> 
+        <el-table-column prop="address" label="操作" width="200">
+          <template slot-scope="scope">
+            <div class="record" @click="record(scope.row)">记录</div>
+            <div class="adjustment" @click="loss(scope.row)">盘损</div>
+          </template>
         </el-table-column>
       </el-table>
     </div>
@@ -216,19 +217,13 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      startDate: null,
-      endDate: null,
       // 提交类型
       submitType: true,
       size: 10,
       spanArr: [],
-
+      warehouseName: '',
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
@@ -311,19 +306,28 @@ export default {
       console.log(row)
       this.$router.push({
         path: 'warehouseManagementNoComplete',
-        query:{baseId:row.warehouseId,
-              positionId:row.binNumberId,
-        }                                                                                                                                                                                                                                                                                                                                                          
-        })
-      
+        query: { baseId: row.warehouseId, positionId: row.binNumberId },
+      })
     },
     //记录
-    record() {
-      this.$router.push({ path: 'warehouseManagementRecord' })
+    record(item) {
+      this.$router.push({
+        name: 'warehouseManagementRecord',
+        query: {
+          baseId: item.warehouseId,
+          positionId: item.binNumberId,
+          warehouseName: item.warehouseName,
+        },
+        params: {
+          remark: item.remark,
+          binNumber: item.binNumber,
+          capacity: item.capacity,
+        },
+      })
     },
     //盘损
     loss(item) {
-     this.$router.push({
+      this.$router.push({
         path: 'warehouseManagementIoss',
         query: {
           baseId: item.warehouseId,
@@ -386,22 +390,10 @@ export default {
     getList() {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseName: this.warehouseName,
       })
         .toPromise()
         .then((response) => {
-          this.getSpanArr(response)
-          // for (var i = 0; i < response.records.length; i++) {
-          //   if (response.records[i].addressUrl != null) {
-          //     response.records[i].addressUrlArray = response.records[
-          //       i
-          //     ].addressUrl.split(',')
-          //   } else {
-          //     response.records[i].addressUrlArray = []
-          //   }
-          // }
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          // this.deptBudgetTotal = response.total
           this.warehouseList = response
         })
     },
@@ -476,8 +468,6 @@ export default {
         })
     },
     find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
       this.currentPage = 1
       this.getList()
     },
@@ -516,4 +506,59 @@ export default {
   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;
+}
+.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;
+}
 </style>

src/views/warehouse/warehouseManagementLook.vue

@@ -16,20 +16,21 @@
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
             alt=""
-          />返回</el-button>
+          />返回</el-button
+        >
       </el-col>
     </el-row>
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <h3>基本信息</h3>
+        <div class="small-title">基本信息</div>
         <!--基本信息-->
-        <ws-info-table> 
+        <ws-info-table>
           <!--仓库名称-->
           <ws-form-item
+            class="warehouseName"
             label="仓库名称"
             span="1"
             prop="warehouseName"
-            class="readonly"
           >
             <ws-select
               v-model="deptBudgetList.warehouseName"
@@ -47,7 +48,7 @@
           </ws-form-item>
           <!--负责人-->
           <ws-form-item label="负责人" span="1" prop="personCharge">
-            {{deptBudgetList.personCharge}}
+            {{ deptBudgetList.personCharge }}
           </ws-form-item>
           <!--负责人电话-->
           <ws-form-item
@@ -56,66 +57,82 @@
             prop="personPhone"
             class="readonly"
           >
-            {{deptBudgetList.personPhone}}
+            {{ deptBudgetList.personPhone }}
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            {{deptBudgetList.warehouseLocation}}
+            {{ deptBudgetList.warehouseLocation }}
           </ws-form-item>
           <!--详细地址-->
-          <ws-form-item label="详细地址" span="1" prop="detailedAddress" class="readonly">
-           {{deptBudgetList.detailedAddress}}
+          <ws-form-item
+            label="详细地址"
+            span="1"
+            prop="detailedAddress"
+            class="readonly"
+          >
+            {{ deptBudgetList.detailedAddress }}
           </ws-form-item>
           <!--总储量（吨)-->
-          <ws-form-item label="总储量（吨)" span="1" prop="totalStorage">      
-            {{deptBudgetList.totalStorage}}
+          <ws-form-item label="总储量（吨)" span="1" prop="totalStorage">
+            {{ deptBudgetList.totalStorage }}
           </ws-form-item>
-           </ws-info-table> 
-          
-          <div v-for='item in deptBudgetList.warehousePositionInfoList'>
-             <ws-info-table> 
-          <!--仓位编号-->
-          <ws-form-item label="仓位编号" span="1" prop="binNumber" class="forlist">
-            <!-- <ws-input
+        </ws-info-table>
+
+        <div v-for="item in deptBudgetList.warehousePositionInfoList">
+          <ws-info-table>
+            <!--仓位编号-->
+            <ws-form-item
+              label="仓位编号"
+              span="1"
+              prop="binNumber"
+              class="forlist"
+            >
+              <!-- <ws-input
               v-model.number="item.binNumber"
               placeholder="请输入仓位编号"
               maxlength="100"
               size="small"
             /> -->
-            {{item.binNumber}}
-          </ws-form-item>
-          <!--最大储量（吨）-->
-          <ws-form-item label="最大储量（吨）" span="1" prop="maxStorage" class="forlist">
-            <!-- <ws-input
+              {{ item.binNumber }}
+            </ws-form-item>
+            <!--最大储量（吨）-->
+            <ws-form-item
+              label="最大储量（吨）"
+              span="1"
+              prop="maxStorage"
+              class="forlist"
+            >
+              <!-- <ws-input
               v-model="item.maxStorage"
               placeholder="请输入最大储量（吨）"
               maxlength="20"
               size="small"
             /> -->
-            {{item.maxStorage}}
-          </ws-form-item>
-          <!--现有储量-->
-          <ws-form-item label="现有储量" span="1" prop="nowStorage">
-            <!-- <ws-input
+              {{ item.maxStorage }}
+            </ws-form-item>
+            <!--现有储量-->
+            <ws-form-item label="现有储量" span="1" prop="nowStorage">
+              <!-- <ws-input
               v-model="item.nowStorage"
               placeholder="请输入现有储量"
               maxlength="100"
               size="small"
             /> -->
-            {{item.nowStorage}}
-          </ws-form-item>
-          <!--备注（选填）-->
-          <ws-form-item label="备注（选填）" span="1" prop="remark">
-            <!-- <ws-input
+              {{ item.nowStorage }}
+            </ws-form-item>
+            <!--备注（选填）-->
+            <ws-form-item label="备注（选填）" span="1" prop="remark">
+              <!-- <ws-input
               v-model="item.remark"
               placeholder="请输入备注（选项）"
               maxlength="100"
               size="small"
             /> -->
-            {{item.remark}}
-          </ws-form-item>
-         </ws-info-table> 
-          </div>
+              {{ item.remark }}
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+        <div class="small-title">仓库照片</div>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px">
@@ -241,9 +258,9 @@ export default {
       console.log(e)
       for (var i = 0; i < this.packtypeList.length; i++) {
         if (this.packtypeList[i].warehouseName == e) {
-         this.getLook(this.packtypeList[i].id)
+          this.getLook(this.packtypeList[i].id)
         }
-      }    
+      }
     },
     loaddata() {
       // 仓库名称
@@ -259,8 +276,8 @@ export default {
       })
         .toPromise()
         .then((response) => {
-         this.deptBudgetList=response
-        //  console.log(this.deptBudgetList)
+          this.deptBudgetList = response
+          //  console.log(this.deptBudgetList)
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -289,19 +306,17 @@ export default {
 .center {
   position: relative;
   margin-top: 100px;
-  top: 100px;
+  top: 30px;
   width: 90%;
   height: 500px;
   margin: 0 auto;
 }
 .container .bg-left {
-  margin-left: 40px;
+  padding-left: 40px;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+.bg-right {
+  padding: 16px;
+  text-align: right;
 }
 .vertical-text-left {
   width: 62px;
@@ -310,58 +325,98 @@ export default {
 /deep/.el-form-item {
   width: 33.33%;
 }
-.forlist{
+.forlist {
   width: 16.67%;
 }
 //文字基本信息
-.center h3{
+.center h3 {
   margin-left: 42px;
 }
 //去边框
-/deep/.el-form-item{
-    border-right:0px; 
-   border-bottom: 0px;
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
 }
-/deep/.ws-info-table{
-border-left: 0px; 
-     border-top: 0px;
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
 }
-.ws-info-table .el-form-item .el-form-item__content{
-   border-right:0px; 
-   border-bottom: 0px;
-   border-left: 0px; 
-     border-top: 0px;
+.ws-info-table .el-form-item .el-form-item__content {
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right:0px; 
-   border-bottom: 0px;
-   border-left: 0px; 
-     border-top: 0px;
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-top: 0px;
 }
 //背景
-/deep/.ws-info-table .el-form-item .el-form-item__content{
-background: #F5F7FA;
-border-radius: 4px;
-border: 1px solid #D8DCE6;
-font-family: PingFangSC-Regular, PingFang SC;
-margin-bottom: 5px;
- background-color: #eee;
- font-size: 14px;
- font-weight: 400;
-color: #8890B1;
-line-height: 16px;
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__label{
+/deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
   font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #8890B1;
- line-height: 16px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 //多选框
-/deep/.el-input__inner{
+/deep/.el-input__inner {
+  display: inline-block;
+  background-color: #fff;
+}
+/deep/.ws-info-table .warehouseName.el-form-item .el-form-item__content {
+  background: #fff;
+  border: none;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
   display: inline-block;
-  background-color: #eee;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.ws-info-table {
+  border-left: 1px solid transparent;
+  border-top: 1px solid transparent;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
 }
 </style>

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -16,8 +16,10 @@
     </el-row>
     <div class="center">
       <h2>鲅鱼圈一号库 102仓位（容量100吨）</h2>
-      <ws-form ref="deptBudgetList" :model="deptBudgetList">
-        <el-table>
+      <!-- <ws-form ref="deptBudgetList" :v-model="deptBudgetList"> -->
+        <el-table
+        :data="improved.records"
+        >
           <el-table-column type="index" label="序号">
             <template scope="scope">
               <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -30,19 +32,21 @@
           <el-table-column prop="netWeight" label="净重（吨）"></el-table-column>   
           <el-table-column prop="grade" label="品级"> </el-table-column>
           <el-table-column prop="inOutDate" label="出入库日期"> </el-table-column>
-          <el-table-column prop="buyer" label="类型"> </el-table-column>
+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
           <el-table-column prop="contractNo" label="合同编号"> </el-table-column>
           <el-table-column prop="carNo" label="车牌号"> </el-table-column>
           <el-table-column prop="agent" label="经办人"> </el-table-column>
-          <el-table-column prop=" backOffice" label="内勤"> </el-table-column>
+          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
           <el-table-column prop="updateDate" label="保存时间"> </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
+            <template scope="scope">
           <ws-button
             type="primary"
-            @click="edits(scope.row)"
+             @click="edits(scope.row)"
             v-hasPermission="
               `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
             "
+           
             >编辑</ws-button
           >
           <ws-button
@@ -53,7 +57,7 @@
             "
             >删除</ws-button
           >
-          <!-- </template> -->
+          </template>
         </el-table-column>
         </el-table>
         <div style="text-align: right; padding: 10px">
@@ -64,10 +68,12 @@
             @click="returnWarehouse()"
             >关闭</el-button
           >
+          
         </div>
-      </ws-form>
+      <!-- </ws-form> -->
     </div>
   </div>
+  
 </template>
 <script>
 import {
@@ -120,7 +126,8 @@ export default {
       deletewarehouse:[],
       pageSize:10,
       currentPage:'1',
-      
+      improved:[],
+      row:[],
 
       // 提交类型
       submitType: true,
@@ -156,14 +163,6 @@ export default {
     this.showType = this.isShow
   },
   methods: {
-
-    //编辑
-     edits(row){
-       this.$router.push({
-         name:'warehouseManagementPerfectput',
-         query: { baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage },
-       })
-     },
     //返回按钮
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
@@ -173,8 +172,20 @@ export default {
      this.$router.push({path:'warehouseManagementDelete'})
     },
     //编辑
-    edits(){
-      this.$router.push({ path: 'warehouseManagementPerfectput' })
+    edits(row){
+      if(row.inOutFlag==2){
+         this.$router.push({
+           path:'warehouseManagementPerfectput',
+          
+           })
+      }else if(row.inOutFlag==1){
+        this.$router.push({
+          path:'warehouseManagementPerfectDelivery',
+
+          })
+        
+      }
+     
     },
     dateFormat(fmt, date) {
       let ret
@@ -223,15 +234,9 @@ export default {
     })
     .toPromise()
         .then((response) => {
-          this.getList = response
+          this.improved = response
         })
     },
-    // complete(){
-    //   complete({
-
-    //   })
-    // },
-
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
@@ -341,4 +346,5 @@ export default {
 /deep/.el-form-item {
   width: 33%;
 }
+
 </style>

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -51,12 +51,13 @@
         <!-- 品级 -->
         <ws-form-item label="品级" span="1" class="readonly">
           <ws-select
+          v-model="deptBudgetList.grade"
             placeholder=""
             class="typeselect"
             @change="selectpackingMethod"
           >
             <ws-option
-              v-for="item in goodnameList"
+              v-for="item in gradeList"
               :key="item.constKey"
               :label="item.constValue"
               :value="item.constValue"
@@ -223,6 +224,13 @@
         </div>
 
         <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="returnWarehouse()"
+            >暂存</el-button
+          >
           <el-button
             class="bg-bottom-up"
             type="primary"
@@ -236,7 +244,7 @@
   </div>
 </template>
 <script>
-import { getList, export1, billoperatehis } from '@/model/contarct/index'
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -310,9 +318,12 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-    this.getList()
+    // this.getList()
     this.showType = this.isShow
   },
+  mounted(){
+    this.getList()
+  },
   methods: {
     //返回按钮
     returnNoComplete() {
@@ -320,7 +331,39 @@ export default {
     },
     //提交按钮
     submit() {
-      this.$router.push({ path: 'warehouseManagementList' })
+     this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    //暂存按钮
+    returnWarehouse() {
+       this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('暂存成功')
+              this.$router.push({ path: 'warehouseManagementNoComplete' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -358,33 +401,25 @@ export default {
       this.getList()
     },
     getList() {
-      getList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
+     // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      // 类型
+      pullDown({ constId: 'CON5' })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.storageType = response
         })
+    
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -237,6 +237,13 @@
         </div>
 
         <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="returnWarehouse()"
+            >暂存</el-button
+          >
           <el-button
             class="bg-bottom-up"
             type="primary"
@@ -244,13 +251,14 @@
             @click="submit()"
             >提交</el-button
           >
+          
         </div>
       </ws-form>
     </div>
   </div>
 </template>
 <script>
-import { getList, export1, billoperatehis } from '@/model/contarct/index'
+import { pullDown, addstorageputList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -334,7 +342,39 @@ export default {
     },
     //提交按钮
     submit() {
-      this.$router.push({ path: 'warehouseManagementList' })
+       this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    // 暂存按钮
+    returnWarehouse() {
+       this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('暂存成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -371,33 +411,24 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      getList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
+     getList() {
+      // 货名
+      pullDown({ constId: 'CON2' })
+        .toPromise()
+        .then((response) => {
+          this.goodnameList = response
+        })
+      // 品级
+      pullDown({ constId: 'CON3' })
+        .toPromise()
+        .then((response) => {
+          this.gradeList = response
+        })
+      // 类型
+      pullDown({ constId: 'CON5' })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.storageType = response
         })
     },
     selecttaskType(e) {

src/views/warehouse/warehouseManagementPut.vue

@@ -69,9 +69,8 @@
           <!--净重（吨）-->
           <ws-form-item label="净重（吨）" span="1" prop="netWeight">
             <ws-input
-              v-model.number="deptBudgetList.netWeight"
+              v-model="deptBudgetList.netWeight"
               placeholder="不可编辑，自动计算"
-              type="number"
               maxlength="120"
               size="small"
             />
@@ -234,6 +233,13 @@
         </ws-form-item>
       </ws-info-table>
       <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom-up"
+          type="primary"
+          size="small"
+          @click="temporaryStorage()"
+          >暂存</el-button
+        >
         <el-button
           class="bg-bottom-up"
           type="primary"
@@ -335,7 +341,7 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.getList()
   },
-  // activated() {
+  activated() {
   //   //cg.viewBudget
   //   //cg.viewSpareMoney
   //   // this.getVesselData();
@@ -343,7 +349,8 @@ export default {
   //   this.getList()
   //   console.log(1111)
   //   this.showType = this.isShow
-  // },
+  // this.getList(this.$route.query.baseId,)
+  },
   methods: {
     //返回按钮
     returnWarehouse() {
@@ -355,6 +362,7 @@ export default {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.inOutFlag = 2
+          this.deptBudgetList.statusFlag = 3
           addstorageputList(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -367,6 +375,71 @@ export default {
         }
       })
     },
+    // 暂存按钮
+    returnWarehouse() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },ubmit() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 2
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
+    temporaryStorage() {
+      this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
+              this.deptBudgetList.inOutFlag = 2
+              this.deptBudgetList.statusFlag = 1
+              addstorageputList(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('暂存成功')
+                  this.$router.push({ path: 'warehouseManagementList' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+
+    },
     tarechange(e) {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         this.deptBudgetList.netWeight = Number(
@@ -549,14 +622,12 @@ export default {
 }
 
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-
   text-align: center;
 }
 .deliverydate {
   width: 35%;
 }
 .center {
-
   margin-top: -60px;
 }
 </style>

src/views/warehouse/warehouseManagementRecord.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="container">
     <el-row>
-      <el-col :span="20">
+      <el-col :span="18">
         <h2 class="bg-left title">流转记录</h2>
       </el-col>
-      <el-col :span="4" class="bg-right">
+      <el-col :span="6" class="bg-right">
         <el-button
           class="bg-bottom"
           type="primary"
@@ -12,15 +12,26 @@
           @click="iossrecord()"
           >盘损记录</el-button
         >
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnWarehouse()"
+          >返回</el-button
+        >
       </el-col>
     </el-row>
     <div class="center">
-      <h2>鲅鱼圈一号库 102仓位（容量100吨）</h2>
-      <p>我是备注我是备注。。。。。。。。。。。。。</p>
+      <h2>
+        {{ deptBudgetList.warehouseName }}库 {{ binNumber }}仓位（容量{{
+          capacity
+        }}吨）
+      </h2>
+      <p>备注：{{ remark }}</p>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
         <ws-button
           type="primary"
-          @click="1"
+          @click="record('')"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -28,7 +39,7 @@
         >
         <ws-button
           type="primary"
-          @click="1"
+          @click="record(1)"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -36,53 +47,93 @@
         >
         <ws-button
           type="primary"
-          @click="1"
+          @click="record(2)"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
           >入库记录</ws-button
         >
-        <el-table>
+        <el-table :data="warehouseList.records" height="560">
+          <el-table-column type="expand">
+            <template #default="props">
+              <ws-form ref="deptBudgetList" :model="deptBudgetList">
+                <ws-info-table>
+                  <ws-form-item label="水分(%)<=" span="1" prop="waterContent">
+                    {{ props.row.waterContent }}
+                  </ws-form-item>
+                  <ws-form-item label="容重(%)<=" span="1" prop="bulkDensity">
+                    {{ props.row.bulkDensity }}
+                  </ws-form-item>
+                  <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+                    {{ props.row.jiaorenli }}
+                  </ws-form-item>
+                  <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+                    {{ props.row.impurity }}
+                  </ws-form-item>
+                  <ws-form-item label="霉变粒(%)<=" span="1" prop="mildewGrain">
+                    {{ props.row.mildewGrain }}
+                  </ws-form-item>
+                  <ws-form-item
+                    label="不完善粒(%)<="
+                    span="1"
+                    prop="imperfectGrain"
+                  >
+                    {{ props.row.imperfectGrain }}
+                  </ws-form-item>
+                  <ws-form-item label="质检员" span="1" prop="qualityInspector">
+                    {{ props.row.qualityInspector }}
+                  </ws-form-item>
+                </ws-info-table>
+              </ws-form>
+            </template>
+          </el-table-column>
           <el-table-column type="index" label="序号">
             <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="contractNo" label="货名"> </el-table-column>
-          <el-table-column prop="goodsName" label="毛重（吨）"></el-table-column>
-          <el-table-column prop="weight" label="皮重（吨）"> </el-table-column>
-          <el-table-column prop="unitContractPrice" label="净重（吨）"></el-table-column>   
-          <el-table-column prop="packingMethod" label="品级"> </el-table-column>
-          <el-table-column prop="buyer" label="出入库日期"> </el-table-column>
-          <el-table-column prop="buyer" label="类型"> </el-table-column>
-          <el-table-column prop="buyer" label="合同编号"> </el-table-column>
-          <el-table-column prop="buyer" label="车牌号"> </el-table-column>
-          <el-table-column prop="buyer" label="经办人"> </el-table-column>
+          <el-table-column prop="goodsName" label="货名"> </el-table-column>
+          <el-table-column
+            prop="grossWeight"
+            label="毛重（吨）"
+          ></el-table-column>
+          <el-table-column prop="tare" label="皮重（吨）"> </el-table-column>
+          <el-table-column
+            prop="netWeight"
+            label="净重（吨）"
+          ></el-table-column>
+          <el-table-column prop="grade" label="品级"> </el-table-column>
+          <el-table-column prop="inOutDate" label="出入库日期">
+          </el-table-column>
+          <el-table-column prop="inOutType" label="类型"> </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号">
+          </el-table-column>
+          <el-table-column prop="carNo" label="车牌号"> </el-table-column>
+          <el-table-column prop="qualityInspector" label="经办人">
+          </el-table-column>
           <el-table-column prop="buyer" label="内勤"> </el-table-column>
-          <el-table-column prop="buyer" label="附件"> </el-table-column>
-          <el-table-column prop="buyer" label="录入时间"> </el-table-column>
+          <el-table-column prop="addressUrl" label="附件"> </el-table-column>
+          <el-table-column prop="createDate" label="录入时间">
+          </el-table-column>
         </el-table>
-        <div style="text-align: right; padding: 10px">
-          <el-button
-            class="bg-bottom-up"
-            type="primary"
-            size="small"
-            @click="returnWarehouse()"
-            >关闭</el-button
+        <div style="text-align: center; padding: 10px">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="deptCircularPage.pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="deptBudgetTotal"
           >
+          </el-pagination>
         </div>
       </ws-form>
     </div>
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/contarct/index'
+import { addselectinfoList } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -122,6 +173,8 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
+      remark: '',
+      binNumber: '',
       // 提交类型
       submitType: true,
       selectpackingMethod: {},
@@ -129,13 +182,16 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       packtypeList: {},
+      currentPage: 1,
+      pageSize: 10,
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
       },
-      contractList: [],
+      warehouseList: [],
       deptBudgetList: {},
       historyList: [],
+      searchType: '',
 
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -146,9 +202,13 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
+    this.deptBudgetList.baseId = this.$route.query.baseId
+    this.deptBudgetList.positionId = this.$route.query.positionId
+    this.deptBudgetList.warehouseName = this.$route.query.warehouseName
+    this.remark = this.$route.params.remark
+    this.binNumber = this.$route.params.binNumber
+    this.capacity = this.$route.params.capacity
+    console.log(111)
     this.getList()
     this.showType = this.isShow
   },
@@ -159,7 +219,14 @@ export default {
     },
     //
     iossrecord() {
-      this.$router.push({ path: 'warehouseManagementIossRecord' })
+      this.$router.push({
+        path: 'warehouseManagementIossRecord',
+        query: {
+          baseId: this.deptBudgetList.baseId,
+          positionId: this.deptBudgetList.positionId,
+          warehouseName: this.deptBudgetList.warehouseName,
+        },
+      })
     },
     dateFormat(fmt, date) {
       let ret
@@ -196,33 +263,26 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    record(status) {
+      this.searchType = status
+      this.getList()
+    },
     getList() {
-      getList({
+      addselectinfoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
+        baseId: this.deptBudgetList.baseId,
+        positionId: this.deptBudgetList.positionId,
+        warehouseName: this.deptBudgetList.warehouseName,
+        searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
-          this.contractList = response
+          this.warehouseList = response
         })
     },
     selecttaskType(e) {
@@ -306,6 +366,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.winseaview-view {
+  height: 100vh;
+}
+/deep/.el-form .el-form-item {
+  width: 14.28%;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+}
 .center {
   position: relative;
   top: 50px;
@@ -313,22 +382,20 @@ export default {
   height: 500px;
   margin: 0 auto;
 }
-.center button{
+.center button {
   margin-bottom: 15px;
 }
 .container .bg-left {
   margin-left: 40px;
 }
-.container .bg-bottom {
-  position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
 }
+.bg-right {
+  text-align: right;
+  padding: 10px;
+}
 /deep/.el-form-item {
   width: 33%;
 }

vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.119:8090/',
+        target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址