Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/api/V2/warehouse/index.js

@@ -4,7 +4,6 @@ export const API_POST_ADD_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/api/addWareho
 export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
 //仓库名称下拉
 export const API_GET_WAREHOUSE_CUSTOMDROPDOWN = '/warehouseBaseInfo/selectWarehouse'
-
 //删除
 export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 //删除仓库列表
@@ -24,7 +23,6 @@ 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_GET_SELECT_INFO = `/warehouseInOutInfo/selectInfo`
@@ -36,3 +34,5 @@ export const API_POST_STORAGE_IOSS = '/warehouseInventoryCountInfo/addInventory'
 export const API_GET_WAREHOUSE_COMPLETE = '/warehouseInOutInfo/selectWarehouseInOutInfo'
 // 编辑删除仓位
 export const API_POST_WAREHOUSE_DEL_POSITION = '/warehousePositionInfo/api/deleteWarehousePosition'
+//删除待完善记录
+export const API_POST_WAREHOUSE_DEL_INOUTINFO = '/warehouseInOutInfo/api/deleteWarehouse'

src/model/warehouse/index.js

@@ -17,7 +17,8 @@ import {
     API_GET_WAREHOUSE_INVENTORYCOUNT,
     API_POST_STORAGE_IOSS,
     API_GET_WAREHOUSE_COMPLETE,
-    API_POST_WAREHOUSE_DEL_POSITION
+    API_POST_WAREHOUSE_DEL_POSITION,
+    API_POST_WAREHOUSE_DEL_INOUTINFO
 } from '@/api/V2/warehouse'
 // 列表
 export const getList = appRx.get(API_GET_WAREHOUSE_BASEINFO, errorCatcher, errorHandle, filter)
@@ -28,7 +29,6 @@ export const getLook = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHand
 //仓库下拉
 export const xiala = appRx.get(API_GET_WAREHOUSE_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 //删除
-
 export const deletewarehouse = appRx.post(API_POST_WAREHOUSE_DELETE, errorCatcher, errorHandle, filter)
 //删除库房列表
 export const delectlist = appRx.get(API_GET_WAREHOUSE_DELETELIST, errorCatcher, errorHandle, filter)
@@ -53,7 +53,9 @@ export const submitioss = appRx.post(API_POST_STORAGE_IOSS, errorCatcher, errorH
 //待完善记录
 export const complete = appRx.get(API_GET_WAREHOUSE_COMPLETE, errorCatcher, errorHandle, filter)
 // 编辑删除仓位
-
 export const delPosition = appRx.post(API_POST_WAREHOUSE_DEL_POSITION, errorCatcher, errorHandle, filter)
+//删除待完善记录
+export const delInOut = appRx.post(API_POST_WAREHOUSE_DEL_INOUTINFO, errorCatcher, errorHandle, filter)
+
 
 

src/views/warehouse/warehouseManagementDelete.vue

@@ -43,34 +43,6 @@
         <el-table-column prop="personCharge;" label="负责人"> </el-table-column>
 
         <el-table-column prop="address" label="操作" width="200">
-          <!-- <template slot-scope="scope">
-            <ws-button
-              type="primary"
-              @click="handleHide(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              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"
-              >隐藏</ws-button
-            >
-            <ws-button
-              type="primary"
-              @click="handleDelete(sv-ifcope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-              >删除</ws-button
-            >
-          </template> -->
           <template slot-scope="scope">
             <div
               class="record"
@@ -192,6 +164,33 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
+    //删除
+    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'))
+          })
+      })
+      .catch(() => {
+        return false
+      })
+  },
     //隐藏
     handleHide(row) {
       if (row.showFlag == 1) {
@@ -235,32 +234,7 @@ export default {
       }
     },
   },
-  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'))
-          })
-      })
-      .catch(() => {
-        return false
-      })
-  },
+  
   // deletecontract(){},
   //删除
   approve() {},

src/views/warehouse/warehouseManagementDelivery.vue

@@ -256,7 +256,6 @@
 </template>
 <script>
 import { pullDown, addstorageputList, goodsname } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -351,6 +350,103 @@ export default {
       this.$router.push({ path: 'warehouseManagementList' })
     },
     temporaryStorage() {
+       if (!this.deptBudgetList.goodsName) {
+        this.$message({
+          message: '货名不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if(!this.deptBudgetList.grossWeight){
+         this.$message({
+          message: '毛重不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.grossWeight < 0 ||
+        this.deptBudgetList.grossWeight > 10000 ||
+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
+          String(this.deptBudgetList.grossWeight).length -
+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
+            3)
+      ) {
+        this.$message({
+          message: '毛重输入错误',
+          type: 'warning',
+        })
+        return
+      }
+       if(!this.deptBudgetList.tare){
+         this.$message({
+          message: '皮重不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare > 10000 ||
+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
+          String(this.deptBudgetList.tare).length -
+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
+            3)
+      ) {
+        this.$message({
+          message: '皮重输入错误',
+          type: 'warning',
+        })
+        return
+      }
+       if(!this.deptBudgetList.agent){
+         this.$message({
+          message: '经办人不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.agent.length < 2 ||
+        this.deptBudgetList.agent.length > 10
+      ) {
+        this.$message({
+          message: '经办人输入有误',
+          type: 'warning',
+        })
+        return
+      }
+       if(!this.deptBudgetList.carNo){
+         this.$message({
+          message: '车牌号不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.deptBudgetList.carNo.length > 7) {
+        this.$message({
+          message: '车牌号输入错误,请输入7个字符之内',
+          type: 'warning',
+        })
+        return
+      }
+       if(!this.deptBudgetList.contractNo){
+         this.$message({
+          message: '合同编号不能为空',
+          type: 'warning',
+        })
+        return
+      }
+      if (
+        this.deptBudgetList.contractNo.length < 6 ||
+        this.deptBudgetList.contractNo.length > 20
+      ) {
+        this.$message({
+          message: '合同编号长度不符合要求,请输入6-20个字符之内',
+          type: 'warning',
+        })
+        return
+      }
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -398,10 +494,14 @@ export default {
       }
       if (
         this.deptBudgetList.grossWeight < 0 ||
-        this.deptBudgetList.grossWeight >= 10000
+        this.deptBudgetList.grossWeight > 10000 ||
+        (String(this.deptBudgetList.grossWeight).indexOf('.') != -1 &&
+          String(this.deptBudgetList.grossWeight).length -
+            (String(this.deptBudgetList.grossWeight).indexOf('.') + 1) >
+            3)
       ) {
         this.$message({
-          message: '毛重输入错误！',
+          message: '毛重输入错误',
           type: 'warning',
         })
         return
@@ -413,9 +513,16 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.tare < 0 || this.deptBudgetList.tare >= 10000) {
+     if (
+        this.deptBudgetList.tare < 0 ||
+        this.deptBudgetList.tare > 10000 ||
+        (String(this.deptBudgetList.tare).indexOf('.') != -1 &&
+          String(this.deptBudgetList.tare).length -
+            (String(this.deptBudgetList.tare).indexOf('.') + 1) >
+            3)
+      ) {
         this.$message({
-          message: '皮重输入错误！',
+          message: '皮重输入错误',
           type: 'warning',
         })
         return
@@ -509,7 +616,13 @@ export default {
         })
         return
       }
-      this.$refs.deptBudgetList.validate((valid) => {
+       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
@@ -525,6 +638,7 @@ export default {
           return false
         }
       })
+        })  
     },
     tarechange(e) {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
@@ -621,44 +735,6 @@ export default {
         query: { id: row.id },
       })
     },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-
-    // async exportlist() {
-    //   const { data } = await export1(
-    //     {
-    //       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,
-    //     },
-    //     {},
-    //     { responseType: 'blob' }
-    //   ).toPromise()
-    //   downloadFile({
-    //     res: data,
-    //     fileName: `${
-    //       this.date.year + (this.date.month ? `-${this.date.month}` : '')
-    //     }_采购合同`,
-    //     type: 'xls',
-    //   })
-    // },
-    // deletecontract(){},
     //删除
     approve() {},
     listQuery() {},

src/views/warehouse/warehouseManagementIoss.vue

@@ -5,7 +5,7 @@
         <h2 class="bg-left title">&nbsp;&nbsp;盘损当期仓损</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-         <el-button
+        <el-button
           class="bg-bottom"
           type="primary"
           size="small"
@@ -20,16 +20,19 @@
         >
       </el-col>
     </el-row>
-    <div class="center">  
+    <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
-        <h2>                      
-          {{deptBudgetList1.warehouseName }}库
-          <span class="position">
-          {{deptBudgetList1.binNumber }}仓位
-          </span>
-      </h2>
+        <h2>
+          {{ deptBudgetList1.warehouseName }}库
+          <span class="position"> {{ deptBudgetList1.binNumber }}仓位 </span>
+        </h2>
         <!-- 货名 -->
-        <ws-form-item label="货名：" span="1" prop="goodsName" class="goodsname">
+        <ws-form-item
+          label="货名："
+          span="1"
+          prop="goodsName"
+          class="goodsname"
+        >
           <ws-select
             v-model="deptBudgetList.goodsName"
             placeholder=""
@@ -45,11 +48,21 @@
           </ws-select>
         </ws-form-item>
         <!--当期累计入库量-->
-        <ws-form-item label="当期累计入库量（吨）：" span="1" prop="cumulativeStockIn" class="readonly">
-          {{deptBudgetList.cumulativeStockIn}}
+        <ws-form-item
+          label="当期累计入库量（吨）："
+          span="1"
+          prop="cumulativeStockIn"
+          class="readonly"
+        >
+          {{ deptBudgetList.cumulativeStockIn }}
         </ws-form-item>
         <!--实际库存（吨）-->
-        <ws-form-item label="实际库存（吨）：" span="1" prop="physicalInventory" class="readonly">
+        <ws-form-item
+          label="实际库存（吨）："
+          span="1"
+          prop="physicalInventory"
+          class="readonly"
+        >
           <ws-input
             v-model="deptBudgetList.physicalInventory"
             placeholder=""
@@ -58,24 +71,50 @@
           />
         </ws-form-item>
         <!--当期累计出库量（吨）-->
-        <ws-form-item label="当期累计出库量（吨）：" span="1" prop="cumulativeStockOut" class="readonly">
-          {{deptBudgetList.cumulativeStockOut}}
+        <ws-form-item
+          label="当期累计出库量（吨）："
+          span="1"
+          prop="cumulativeStockOut"
+          class="readonly"
+        >
+          {{ deptBudgetList.cumulativeStockOut }}
         </ws-form-item>
-           <!--损耗量（吨）-->
-        <ws-form-item label="损耗量（吨）：" span="1" prop="ioss" class="readonly">
-          {{ioss1 > 0 ? ioss1 : 0}}
+        <!--损耗量（吨）-->
+        <ws-form-item
+          label="损耗量（吨）："
+          span="1"
+          prop="ioss"
+          class="readonly"
+        >
+          {{ ioss1 > 0 ? ioss1 : 0 }}
         </ws-form-item>
         <!--应余库存（吨）-->
-        <ws-form-item label="应余库存（吨）：" span="1" prop="surplusInventory" class='readonly'>
-         {{surplusInventory1 > 0 ? surplusInventory1 : 0 }}
+        <ws-form-item
+          label="应余库存（吨）："
+          span="1"
+          prop="surplusInventory"
+          class="readonly"
+        >
+          {{ surplusInventory1 > 0 ? surplusInventory1 : 0 }}
         </ws-form-item>
         <!--库损比例-->
-        <ws-form-item label="库损比例：" span="1" prop="inventoryRatio" class="readonly">
+        <ws-form-item
+          label="库损比例："
+          span="1"
+          prop="inventoryRatio"
+          class="readonly"
+        >
           <!-- .占比=损耗量÷（累计入库-实际库存） -->
-          <span class="proportion" v-show="inventoryRatio1 > 3">{{inventoryRatio1 > 0 ? inventoryRatio1 : 0}} {{'‰'}}</span> 
-          <span class="proportion1" v-show="inventoryRatio1 <3">{{inventoryRatio1 > 0 ? inventoryRatio1 : 0}} {{'‰'}}</span>
+          <span class="proportion" v-show="inventoryRatio1 > 3"
+            >{{ inventoryRatio1 > 0 ? inventoryRatio1 : 0 }} {{ '‰' }}</span
+          >
+          <span class="proportion1" v-show="inventoryRatio1 < 3"
+            >{{ inventoryRatio1 > 0 ? inventoryRatio1 : 0 }} {{ '‰' }}</span
+          >
         </ws-form-item>
-        <p class="fontsize">注：提交成功后，当期实际库存将作为下一期的初始库存。</p>
+        <p class="fontsize">
+          注：提交成功后，当期实际库存将作为下一期的初始库存。
+        </p>
       </ws-form>
 
       <div style="text-align: right; padding: 10px">
@@ -97,11 +136,11 @@ import {
   submitioss,
 } from '@/model/warehouse/index'
 
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
+import { mapActions, mapGetters, mapState } from 'vuex'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
-import { dayjs, EventBus } from 'base-core-lib'
+import { dayjs} from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -174,9 +213,19 @@ export default {
     }
   },
    computed:{
-        ioss1 :function() {
+    ...mapGetters([
+      'userInfo',
+      'isFullScren',
+      'tagWel',
+      'tagList',
+      'isCollapse',
+      'tag',
+      'logsLen',
+      'logsFlag',
+      'language',
+    ]),
+    ioss1 :function() {
      return (this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut)-this.deptBudgetList.physicalInventory
-      // return this.message.split('').reverse().join('')
     },
     surplusInventory1: function(){
       return this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut
@@ -192,7 +241,9 @@ export default {
       }
      
      return num;
-    }
+    },
+      
+
    },
   activated() {
     //cg.viewBudget
@@ -231,6 +282,7 @@ export default {
           this.deptBudgetList.positionId=this.deptBudgetList1.positionId
           this.deptBudgetList.binNumber=this.deptBudgetList1.binNumber
           this.deptBudgetList.warehouseName=this.deptBudgetList1.warehouseName
+          this.deptBudgetList.qualityInspector= this.userInfo.showRoleName
        for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].goodsName == this.deptBudgetList.goodsName) {
           this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
@@ -318,18 +370,7 @@ export default {
         }
       }
     },  
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
+   
     // deletecontract(){},
     //删除
     approve() {},
@@ -348,71 +389,70 @@ export default {
   top: 50px;
   width: 40%;
   height: 700px;
-  margin: 0 auto; 
+  margin: 0 auto;
 }
 /deep/.el-form-item__label {
-    width: 160px;
+  width: 160px;
 }
-/deep/.el-input--small{
+/deep/.el-input--small {
   width: 70%;
 }
-/deep/.bg-right{
-    padding-right: 10px;
-    text-align: right;
+/deep/.bg-right {
+  padding-right: 10px;
+  text-align: right;
 }
 .container .bg-bottom {
- margin: 15px 0px;
+  margin: 15px 0px;
 }
 
 //仓位
-.position{
- width: 52px;
-height: 20px;
-background: #AFB5CB;
-border-radius: 2px;
-font-size: 12px;
-font-family: PingFangSC-Medium, PingFang SC;
-color: #FFFFFF;
-line-height: 20px;
+.position {
+  background: #afb5cb;
+  border-radius: 2px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 20px;
+  display: inline-grid;
+  padding: 2px 4px;
 }
 //表格
-.readonly{
-    width: 49%;
-    display: inline-flex;
-    height: 40px;
+.readonly {
+  width: 49%;
+  display: inline-flex;
+  height: 40px;
 }
 /deep/.el-form-item__label {
-    width: 170px;
-    text-align: left;
-    font-size: 14px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #8890B1;
-line-height: 16px;
+  width: 170px;
+  text-align: left;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 //下拉框
-.goodsname{
+.goodsname {
   width: 40%;
 }
-.goodsname:first-child{
+.goodsname:first-child {
   width: 140px;
 }
 //注意字体
-.fontsize{
+.fontsize {
   width: 312px;
-height: 17px;
-font-size: 12px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #AFB5CB;
-line-height: 17px;
+  height: 17px;
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 17px;
 }
 //比例文字
-.proportion{
-color: #FF2C58;
+.proportion {
+  color: #ff2c58;
 }
-.proportion1{
-color: black;
+.proportion1 {
+  color: black;
 }
 .title {
   position: relative;

src/views/warehouse/warehouseManagementLook.vue

@@ -61,7 +61,7 @@
           </ws-form-item>
           <!--仓库所在地-->
           <ws-form-item label="仓库所在地" span="1" prop="warehouseLocation">
-            {{ deptBudgetList.warehouseLocation }}
+            {{ deptBudgetList.warehousePrivate }}{{deptBudgetList.warehouseCity}}{{deptBudgetList.warehouseArea}}
           </ws-form-item>
           <!--详细地址-->
           <ws-form-item

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -20,24 +20,20 @@
         >
       </el-col>
     </el-row>
-<ws-form ref="deptBudgetList" :v-model="deptBudgetList">
-    <div class="center">
-     <h2 style="padding-left: 20px">
-        <img
-          style="position: relative; top: 2px"
-          width="19"
-          height="19"
-          src="../../../public/img/cangku.png"
-          alt=""
-        />
-        {{ this.$route.query.warehouseName}}库
-        <span class="position">
-          {{ this.$route.query.binNumber }}仓位
-          </span>
-      </h2>
-        <el-table
-        :data="improved.records"
-        >
+    <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
+      <div class="center">
+        <h2 style="padding-left: 20px">
+          <img
+            style="position: relative; top: 2px"
+            width="19"
+            height="19"
+            src="../../../public/img/cangku.png"
+            alt=""
+          />
+          {{ this.$route.query.warehouseName }}库
+          <span class="position"> {{ this.$route.query.binNumber }}仓位 </span>
+        </h2>
+        <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>
@@ -45,37 +41,44 @@
             </template>
           </el-table-column>
           <el-table-column prop="goodsName" label="货名"> </el-table-column>
-          <el-table-column prop="tare" label="毛重（吨）"></el-table-column>
-          <el-table-column prop="grossWeight" label="皮重（吨）"> </el-table-column>
-          <el-table-column prop="netWeight" 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="品级">
             <template slot-scope="scope">
-          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
-            scope.row.grade
-          }}</span>
-          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
-            scope.row.grade
-          }}</span>
-          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
-            scope.row.grade
-          }}</span>
-          <span v-if="scope.row.grade == '等外'" class="substandard">{{
-            scope.row.grade
-          }}</span>
-        </template>
-            
-             </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>
+              <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '二等品'" class="second-class">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '三等品'" class="third-class">{{
+                scope.row.grade
+              }}</span>
+              <span v-if="scope.row.grade == '等外'" class="substandard">{{
+                scope.row.grade
+              }}</span>
+            </template>
+          </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="agent" 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="updateDate" label="保存时间">
+          </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
             <!-- <template scope="scope"> -->
-          <!-- <ws-button
+            <!-- <ws-button
             type="primary"
              @click="edits(scope.row)"
             v-hasPermission="
@@ -83,7 +86,7 @@
             "    
             >编辑</ws-button
           > -->
-          <!-- <ws-button
+            <!-- <ws-button
             type="primary"
             @click="handleDelete(scope.row)"
             v-hasPermission="
@@ -91,14 +94,16 @@
             "
             >删除</ws-button
           > -->
-          <!-- </template> -->
-          <template slot-scope="scope">
-            <div class="record" @click="edits(scope.row)">编辑</div>
-            <div class="adjustment" @click="handleDelete(scope.row)">删除</div>
-          </template>
-        </el-table-column>
+            <!-- </template> -->
+            <template slot-scope="scope">
+              <div class="record" @click="edits(scope.row)">编辑</div>
+              <div class="adjustment" @click="handleDelete(scope.row)">
+                删除
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
-        
+
         <div style="text-align: right; padding: 10px">
           <el-button
             class="bg-bottom-up"
@@ -106,27 +111,26 @@
             size="small"
             @click="returnWarehouse()"
             >关闭</el-button
-          >    
+          >
         </div>
-     
-    </div>
-     </ws-form>
+      </div>
+    </ws-form>
   </div>
 </template>
 <script>
 import {
   complete,
-  getList,
   export1,
-  editstatus,
   billoperatehis,
-  deletewarehouse,
-  warehouseName,
+  delInOut,
+  // deletewarehouse,
+  // warehouseName,
+  // addstorageputList,
 } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -162,12 +166,10 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      deletewarehouse:[],
-      pageSize:10,
-      currentPage:'1',
-      improved:[],
-      row:[],
-      deptBudgetList1:[],
+      deletewarehouse: [],
+      improved: [],
+      row: [],
+      deptBudgetList1: [],
 
       // 提交类型
       submitType: true,
@@ -183,8 +185,8 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-      deletewarehouse:[],
-    // inOutDate:null,
+
+      // inOutDate:null,
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -197,11 +199,11 @@ export default {
     //cg.viewBudget
     //cg.viewSpareMoney
     // this.getVesselData();
-     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
-     this.binNumber = this.$route.params.binNumber
-    
+    this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
+    this.binNumber = this.$route.params.binNumber
+
     //接参
-    this.getList(this.$route.query.baseId,this.$route.query.positionId)
+    this.getList(this.$route.query.baseId, this.$route.query.positionId)
     this.showType = this.isShow
   },
   methods: {
@@ -209,35 +211,50 @@ export default {
     returnWarehouse() {
       this.$router.push({ path: 'warehouseManagementList' })
     },
-    //删除
-    deletes(){
-     this.$router.push({path:'warehouseManagementDelete'})
-    },
+
     //编辑
-    edits(row){
-      if(row.inOutFlag==2){
-         this.$router.push({
-           path:'warehouseManagementPerfectput',
-           query:{
-             warehouseName:row.warehouseName,
-            binNumber:row.binNumber,
+    edits(row) {
+      if (row.inOutFlag == 2) {
+        this.$router.push({
+          path: 'warehouseManagementPerfectput',
+          query: {
+            warehouseName: row.warehouseName,
+            binNumber: row.binNumber,
             baseId: row.warehouseId,
             positionId: row.binNumberId,
-
+            goodsName:row.goodsName,
+            grossWeight:row.grossWeight,
+            tare:row.tare,
+            netWeight:row.netWeight,
+            grade:row.grade,
+            agent:row.agent,
+            carNo:row.carNo,
+            inOutDate:row.inOutDate,
+            contractNo:row.contractNo,
+            inOutType:row.inOutType,
            }
            })
       }else if(row.inOutFlag==1){
         this.$router.push({
-          path:'warehouseManagementPerfectDelivery',
-          query:{
-            warehouseName:row.warehouseName,
-            binNumber:row.binNumber,
+          path: 'warehouseManagementPerfectDelivery',
+          query: {
+            warehouseName: row.warehouseName,
+            binNumber: row.binNumber,
             baseId: row.warehouseId,
             positionId: row.binNumberId,
+            goodsName:row.goodsName,
+            grossWeight:row.grossWeight,
+            tare:row.tare,
+            netWeight:row.netWeight,
+            grade:row.grade,
+            agent:row.agent,
+            carNo:row.carNo,
+            inOutDate:row.inOutDate,
+            contractNo:row.contractNo,
+            inOutType:row.inOutType,
           }
           })
       }
-     
     },
     dateFormat(fmt, date) {
       let ret
@@ -274,18 +291,17 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-  //收
-  getList(id,id1){
-   complete({
-          // compId: sessionStorage.getItem('ws-pf_compId'),
-          baseId:id,
-          positionId:id1,
-          pageSize:this.pageSize,
-          currentPage:this.currentPage,
-          
-          // inOutDate:this.inOutDate
-    })
-    .toPromise()
+    //收
+    getList(id, id1) {
+      complete({
+        // compId: sessionStorage.getItem('ws-pf_compId'),
+        baseId: id,
+        positionId: id1,
+        pageSize: this.pageSize,
+        currentPage: this.currentPage,
+        // inOutDate:this.inOutDate
+      })
+        .toPromise()
         .then((response) => {
           this.improved = response
         })
@@ -305,75 +321,41 @@ export default {
         type: 'warning',
       })
         .then(() => {
-        deletewarehouse({ baseId:row.baseId, positionId:row.positionId, pageSize:row.pageSize, currentPage: row.currentPage})
+       delInOut({id:row.id})
             .toPromise()
             .then((response) => {
               this.$notify.success({
                 title: '成功',
                 message: '删除成功',
               })
-              this.getList()
+              this.getList(row.baseId,row.positionId)
             })
             .catch((response) => {
-              
+
             })
         })
         .catch(() => {
           return false
         })
       }
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    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()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          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,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }_采购合同`,
-        type: 'xls',
-      })
-    },
-    // deletecontract(){},
-    //删除
-
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
-  }
+  },
+  
+  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()
+  },
+ 
+  // deletecontract(){},
+  //删除
 
+  approve() {},
+  listQuery() {},
+  total() {},
+  clearfiltQuery() {},
+  selectCrtDuty() {},
+}
 </script>
 <style lang="scss" scoped>
 .center {
@@ -399,52 +381,54 @@ export default {
 /deep/.el-form-item {
   width: 33%;
 }
-.el-row{
-  background: #F6F7FC;
+.el-row {
+  background: #f6f7fc;
   // box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
   border-radius: 4px 4px 1px 1px;
 }
-.container .bg-bottom{
+.container .bg-bottom {
   width: 74px;
   height: 32px;
-  background: #5473E8;
+  background: #5473e8;
   border-radius: 4px;
 }
 .bg-bottom {
-    margin-top: 5px 0px;
+  margin-top: 5px 0px;
 }
-.el-table .el-table__header tr{
+.el-table .el-table__header tr {
   width: 1091px;
   height: 50px;
-  background: #F6F7FC;
-  border: 1px solid #E8ECF6;
+  background: #f6f7fc;
+  border: 1px solid #e8ecf6;
   text-align: center;
 }
-.el-table .cell{
+.el-table .cell {
   text-align: center;
   width: 29px;
-height: 20px;
-font-size: 14px;
-font-family: PingFangSC-Regular, PingFang SC;
-font-weight: 400;
-color: #5878E8;
-line-height: 20px;
+  height: 20px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #5878e8;
+  line-height: 20px;
 }
-.default .winseaview-main .el-table th>.cell{
-  color: #8890B1;
+.default .winseaview-main .el-table th > .cell {
+  color: #8890b1;
 }
-.record, .adjustment {
-    display: inline-block;
-    color: #5878e8;
-    padding: 0 4px !important;
-    position: relative;
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
 }
-/deep/.el-table td, .el-table th {
+/deep/.el-table td,
+.el-table th {
   text-align: center;
 }
 /deep/.el-table .el-table__header th {
-    border-bottom-width: 0px;
-    text-align: center;
+  border-bottom-width: 0px;
+  text-align: center;
 }
 .top-grade {
   background: linear-gradient(90deg, #5678e9, #7993f6);
@@ -480,29 +464,29 @@ line-height: 20px;
 // line-height: 28px;
 // text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
 // }
-.a{
+.a {
   width: 19px;
-height: 19px;
-background: #AFB5CB;
-margin-left: 10px;
+  height: 19px;
+  background: #afb5cb;
+  margin-left: 10px;
 }
-.container .bg-left{
+.container .bg-left {
   width: 140px;
-height: 29px;
-font-size: 21px;
-font-family: PingFangSC-Semibold, PingFang SC;
-font-weight: 600;
-color: #323233;
-line-height: 29px;
+  height: 29px;
+  font-size: 21px;
+  font-family: PingFangSC-Semibold, PingFang SC;
+  font-weight: 600;
+  color: #323233;
+  line-height: 29px;
 }
 .position {
-    width: 52px;
-    height: 20px;
-    background: #AFB5CB;
-    border-radius: 2px;
-    font-size: 12px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    color: #FFFFFF;
-    line-height: 20px;
+  width: 52px;
+  height: 20px;
+  background: #afb5cb;
+  border-radius: 2px;
+  font-size: 12px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  color: #ffffff;
+  line-height: 20px;
 }
 </style>

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -355,6 +355,16 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
+    this.deptBudgetList.goodsName= this.$route.query.goodsName
+    this.deptBudgetList.grossWeight = this.$route.query.grossWeight
+    this.deptBudgetList.tare = this.$route.query.tare
+    this.deptBudgetList.netWeight = this.$route.query.netWeight
+    this.deptBudgetList.grade = this.$route.query.grade
+    this.deptBudgetList.agent = this.$route.query.agent
+    this.deptBudgetList.carNo = this.$route.query.carNo
+    this.deptBudgetList.inOutDate = this.$route.query.inOutDate
+    this.deptBudgetList.contractNo = this.$route.query.contractNo
+    this.deptBudgetList.inOutType = this.$route.query.inOutType
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -184,6 +184,7 @@
             maxlength="120"
             size="small"
           />
+         
         </ws-form-item>
       </div>
       <div class="neifor">
@@ -353,6 +354,16 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
+    this.deptBudgetList.goodsName= this.$route.query.goodsName
+    this.deptBudgetList.grossWeight = this.$route.query.grossWeight
+    this.deptBudgetList.tare = this.$route.query.tare
+    this.deptBudgetList.netWeight = this.$route.query.netWeight
+    this.deptBudgetList.grade = this.$route.query.grade
+    this.deptBudgetList.agent = this.$route.query.agent
+    this.deptBudgetList.carNo = this.$route.query.carNo
+    this.deptBudgetList.inOutDate = this.$route.query.inOutDate
+    this.deptBudgetList.contractNo = this.$route.query.contractNo
+    this.deptBudgetList.inOutType = this.$route.query.inOutType
   },
   methods: {
     //返回按钮
@@ -378,6 +389,7 @@ export default {
                 .toPromise()
                 .then((response) => {
                   this.$message.success('暂存成功')
+                  this.deptBudgetList=response
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
             } else {

src/views/warehouse/warehouseManagementPut.vue

@@ -271,7 +271,6 @@
 </template>
 <script>
 import { pullDown, addstorageputList } from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
@@ -353,7 +352,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.$route.query)
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
@@ -390,6 +388,13 @@ export default {
         })
         return
       }
+      if(!this.deptBudgetList.grossWeight){
+         this.$message({
+          message: '毛重不能为空',
+          type: 'warning',
+        })
+        return
+      }
       if (
         this.deptBudgetList.grossWeight < 0 ||
         this.deptBudgetList.grossWeight > 10000 ||
@@ -403,6 +408,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.tare){
+         this.$message({
+          message: '皮重不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
         this.deptBudgetList.tare < 0 ||
@@ -417,9 +429,16 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.agent){
+         this.$message({
+          message: '经办人不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
-        this.deptBudgetList.car.length < 2 ||
+        this.deptBudgetList.agent.length < 2 ||
         this.deptBudgetList.agent.length > 10
       ) {
         this.$message({
@@ -427,6 +446,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.carNo){
+         this.$message({
+          message: '车牌号不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
@@ -434,6 +460,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.contractNo){
+         this.$message({
+          message: '合同编号不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
         this.deptBudgetList.contractNo.length < 6 ||
@@ -475,13 +508,20 @@ export default {
         })
     },
     temporaryStorage() {
-      if (!this.deptBudgetList.goodsName) {
+       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
           type: 'warning',
         })
         return
       }
+      if(!this.deptBudgetList.grossWeight){
+         this.$message({
+          message: '毛重不能为空',
+          type: 'warning',
+        })
+        return
+      }
       if (
         this.deptBudgetList.grossWeight < 0 ||
         this.deptBudgetList.grossWeight > 10000 ||
@@ -495,6 +535,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.tare){
+         this.$message({
+          message: '皮重不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
         this.deptBudgetList.tare < 0 ||
@@ -509,9 +556,16 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.agent){
+         this.$message({
+          message: '经办人不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
-        this.deptBudgetList.car.length < 2 ||
+        this.deptBudgetList.agent.length < 2 ||
         this.deptBudgetList.agent.length > 10
       ) {
         this.$message({
@@ -519,6 +573,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.carNo){
+         this.$message({
+          message: '车牌号不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (this.deptBudgetList.carNo.length > 7) {
         this.$message({
@@ -526,6 +587,13 @@ export default {
           type: 'warning',
         })
         return
+      }
+       if(!this.deptBudgetList.contractNo){
+         this.$message({
+          message: '合同编号不能为空',
+          type: 'warning',
+        })
+        return
       }
       if (
         this.deptBudgetList.contractNo.length < 6 ||
@@ -663,17 +731,16 @@ export default {
     },
 
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
+    // handleCloe() {
+    //   this.dialogViewSpareMoney = false
+    // },
+    // history(row) {
+    //   billoperatehis({ id: row.id })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.historyList = response
+    //     })
+    // },
     // deletecontract(){},
     //删除
     approve() {},
@@ -757,15 +824,13 @@ export default {
 //仓位
 
 .position{
-
 background: #AFB5CB;
 border-radius: 2px;
 font-size: 12px;
-font-family: PingFangSC-Medium, PingFang SC;
 color: #FFFFFF;
 line-height: 20px;
 display: inline-grid;
-    padding: 2px 4px;
+padding: 2px 4px;
 }
 // .position {
 //   width: 52px;
@@ -776,7 +841,6 @@ display: inline-grid;
 //   font-family: PingFangSC-Medium, PingFang SC;
 //   color: #ffffff;
 //   line-height: 20px;
-
 // }
 //表格文字
 /deep/.ws-info-table .el-form-item .el-form-item__label {