前端gjy

src/api/V2/warehouse/index.js

@@ -20,7 +20,7 @@ export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/api/editWarehouse'
 //盘损
 export const API_GET_WAREHOUSE_IOSS = '/warehouseInventoryCountInfo/getInfo'
 //货名下拉
-export const API_POST_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGoodsName'
+export const API_GET_WAREHOUSE_NAME = '/warehousePositionStorageInfo/selectGoodsName'
 
 // 货名等下拉
 export const API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN = `/commonSysParameter/getInfo`

src/lang/zh.js

@@ -501,7 +501,7 @@
     warehouseManagementRecord:'记录',
     warehouseManagementNoComplete:'待完成',
     warehouseManagementPerfectput:'编辑',
-  
+    warehouseManagementPerfectDelivery:'编辑',
 
 
     // 采购模块
@@ -4696,6 +4696,7 @@
     warehouseManagementRecord:'记录',
     warehouseManagementNoComplete:'待完成',
     warehouseManagementPerfectput:'编辑',
+    warehouseManagementPerfectDelivery:'编辑',
 
   },
   // 年度培训

src/model/warehouse/index.js

@@ -10,7 +10,7 @@ import {
     API_POST_WAREHOUSE_HIDE,
     API_POST_WAREHOUSE_EDIT,
     API_GET_WAREHOUSE_IOSS,
-    API_POST_WAREHOUSE_NAME,
+    API_GET_WAREHOUSE_NAME,
     API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN,
     API_POST_STORAGE_PUT,
     API_GET_SELECT_INFO,
@@ -38,7 +38,7 @@ export const edit = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandl
 //盘损
 export const ioss = appRx.get(API_GET_WAREHOUSE_IOSS, errorCatcher, errorHandle, filter)
 //货名下拉
-export const goodsname = appRx.get(API_POST_WAREHOUSE_NAME, errorCatcher, errorHandle, filter)
+export const goodsname = appRx.get(API_GET_WAREHOUSE_NAME, errorCatcher, errorHandle, filter)
 // 货名等下拉
 export const pullDown = appRx.get(API_GET_CUSTOMDROPDOWN_CUSTOMDROPDOWN, errorCatcher, errorHandle, filter)
 // 入库添加
@@ -49,7 +49,6 @@ export const addselectinfoList = appRx.get(API_GET_SELECT_INFO, errorCatcher, er
 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/component/router/index.js

@@ -198,6 +198,25 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },
+    {
+      path: 'warehouseManagementPerfectDelivery',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementPerfectDelivery'),
+      name: 'warehouseManagementPerfectDelivery',
+      meta: {
+        title: 'warehouseManagementPerfectDelivery',
+        shortcutEntrance: 'warehouseManagementPerfectDelivery',
+        module: 'warehouse.warehouseManagementPerfectDelivery',
+        permissicon: [],
+        keepAlive: true
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden: true
+    },
+
+
+
+    
   ],
 };
 export default warehouseManagementRouter;

src/views/warehouse/warehouseManagementAdd.vue

@@ -172,8 +172,6 @@ npm install vue-amap --save// 仓库添加
       <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> -->
-
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -190,14 +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 {
-  packList,
-  addList,
-  xiala,
-  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 {
@@ -806,4 +797,53 @@ export default {
 .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;
+}
+//地图
+// .position{
+//   margin: 0 auto;
+// }
 </style>

src/views/warehouse/warehouseManagementDelete.vue

@@ -1,7 +1,7 @@
 //删除仓库
 <template>
-  <div > 
-     <el-row>
+  <div>
+    <el-row>
       <el-col :span="20">
         <h2 class="bg-left title">删除仓库</h2>
       </el-col>
@@ -11,52 +11,55 @@
           type="primary"
           size="small"
           @click="returnWarehouse()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</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
@@ -70,13 +73,11 @@
           </template>
         </el-table-column>
       </el-table>
-      
     </div>
   </div>
 </template>
 <script>
-
-import{
+import {
   getList,
   delectlist,
   deletewarehouse,
@@ -102,7 +103,7 @@ export default {
   },
   data() {
     return {
-      isshow:false,
+      isshow: false,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -122,9 +123,9 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      warehouseList:[],
-      scope:[],
-      show:'隐藏',
+      warehouseList: [],
+      scope: [],
+      show: '隐藏',
       // 提交类型
       submitType: true,
       size: 10,
@@ -146,16 +147,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'),
       })
@@ -175,93 +176,333 @@ export default {
       this.dialogViewSpareMoney = false
     },
     //隐藏
-    handleHide(row) { 
-      console.log(row.showFlag)
-      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'))
-            })
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
         })
-        .catch(() => {
-          return false
-        })
-      }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;
 }
-.vertical-text-left {
-  width: 62px;
+.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;
+}
+.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-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;
+}
+
+.connert {
+  padding: 10px 40px;
+}
 </style>

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>
           <!--仓库名称-->
@@ -128,6 +129,7 @@
         </div>
       </ws-form>
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="small-title">上传仓库照片</div>
         <ws-upload
           ref="upload"
           table-name="maintain_work_order"
@@ -140,9 +142,13 @@
           @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> -->
-      <map-drag @marker="marker" @selectedAddress="selectedAddress"></map-drag>
     </div>
     <div style="text-align: right; padding: 10px">
       <el-button
@@ -212,7 +218,7 @@ export default {
       contractList: [],
       deptBudgetList: {},
       historyList: [],
-
+      appendixIdsAdd: '',
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -238,27 +244,21 @@ export default {
       this.deptBudgetList.warehousePositioning =
         e.center.lat + ',' + e.center.lng
     },
-    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
+    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
@@ -363,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;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+.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%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
 }
-.container .bg-left {
-  margin-left: 40px;
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
 }
-.container .bg-bottom {
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
   position: absolute;
-  float: right;
-  top: 15px;
-  right: 20px;
+  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;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
 }
-.vertical-text-left {
-  width: 62px;
+.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/warehouseManagementIoss.vue

@@ -61,7 +61,6 @@
         <ws-form-item label="损耗量（吨）" span="1" prop="ioss">
           {{(deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory > 0 ? (deptBudgetList.cumulativeStockIn-deptBudgetList.cumulativeStockOut)-deptBudgetList.physicalInventory : 0}}
         </ws-form-item>
-
         <!--库损比例-->
         <ws-form-item label="库损比例" span="1" prop="inventoryRatio">
           <!-- .占比=损耗量÷（累计入库-实际库存） -->
@@ -178,9 +177,9 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
-    this.deptBudgetList1.baseId=this.this.$route.query.baseId
+   this.deptBudgetList1.baseId=this.$route.query.baseId
     this.deptBudgetList1.positionId=this.$route.query.positionId
-    this.deptBudgetList1.goodsNameKey=this.deptBudgetList.goodsNameKey
+    // this.deptBudgetList1.goodsNameKey=this.deptBudgetList.goodsNameKey
     // this.getList()
   },
   methods: {
@@ -196,10 +195,14 @@ export default {
           this.deptBudgetList.loss=(this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut)-this.deptBudgetList.physicalInventory
          this.deptBudgetList.inventoryRatio=((this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.cumulativeStockOut)-this.deptBudgetList.physicalInventory)/(this.deptBudgetList.cumulativeStockIn-this.deptBudgetList.physicalInventory)
          this.deptBudgetList.baseId=this.deptBudgetList1.baseId
-         this.deptBudgetList.positionId=this.deptBudgetList1.positionId
-         this.deptBudgetList.binNumber=this.deptBudgetList1.binNumber
-         this.deptBudgetList.warehouseName=this.deptBudgetList1.warehouseName
-         this.deptBudgetList.goodsNameKey=this.deptBudgetList1.goodsNameKey
+          this.deptBudgetList.positionId=this.deptBudgetList1.positionId
+          this.deptBudgetList.binNumber=this.deptBudgetList1.binNumber
+          this.deptBudgetList.warehouseName=this.deptBudgetList1.warehouseName
+       for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].goodsName == this.deptBudgetList.goodsName) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
+        }
+      }
          this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
           console.log(this.deptBudgetList)
@@ -214,7 +217,6 @@ export default {
           return false
         }
       })
-      // this.$router.push({ path: 'warehouseManagementList' })
     },
     dateFormat(fmt, date) {
       let ret
@@ -252,20 +254,11 @@ export default {
       this.getList()
     },
     changeioss(e){
-      console.log(e)
         for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].goodsName == e) {
           this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
         }
-      }
-      // console.log(this.deptBudgetList)
-      //   for (var i = 0; i < this.packtypeList.length; i++) {
-      //     console.log(this.packtypeList[i].goodsName)
-      //   if (this.packtypeList[i].goodsName == e) {
-      //    this.getLook(this.packtypeList[i].id)
-      //   //  console.log(this.packtypeList[i].positionId)
-      //   }
-      // }    
+      }  
       this.ioss()
     },
      ioss(){
@@ -274,9 +267,7 @@ export default {
       )
         .toPromise()
         .then((response) => {
-         this.deptBudgetList=response
-         console.log(this.deptBudgetList)
-        
+         this.deptBudgetList=response     
         })
     },
      loaddata() {
@@ -287,35 +278,6 @@ export default {
           this.goodnameList = response
         })
     },
-    // 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,
-    //   })
-    //     .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
-    //     })
-    // },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
         if (this.taskTypeList[i].value == e) {
@@ -335,7 +297,6 @@ export default {
           this.historyList = response
         })
     },
-   
     // deletecontract(){},
     //删除
     approve() {},

src/views/warehouse/warehouseManagementLook.vue

@@ -10,24 +10,31 @@
           type="primary"
           size="small"
           @click="returnWarehouse()"
-          >返回</el-button
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
         >
       </el-col>
     </el-row>
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        <div class="small-title">基本信息</div>
         <!--基本信息-->
         <ws-info-table>
           <!--仓库名称-->
           <ws-form-item
+            class="warehouseName"
             label="仓库名称"
             span="1"
             prop="warehouseName"
-            class="readonly"
           >
             <ws-select
               v-model="deptBudgetList.warehouseName"
-              placeholder=""
+              placeholder="请输入仓库名称"
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -41,7 +48,7 @@
           </ws-form-item>
           <!--负责人-->
           <ws-form-item label="负责人" span="1" prop="personCharge">
-            {{deptBudgetList.personCharge}}
+            {{ deptBudgetList.personCharge }}
           </ws-form-item>
           <!--负责人电话-->
           <ws-form-item
@@ -50,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>
+              {{ item.remark }}
+            </ws-form-item>
           </ws-info-table>
-          </div>
+        </div>
+        <div class="small-title">仓库照片</div>
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px">
@@ -235,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() {
       // 仓库名称
@@ -253,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组件
@@ -283,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;
@@ -304,7 +325,98 @@ export default {
 /deep/.el-form-item {
   width: 33.33%;
 }
-.forlist{
+.forlist {
   width: 16.67%;
 }
+//文字基本信息
+.center h3 {
+  margin-left: 42px;
+}
+//去边框
+/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;
+  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/.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;
+  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/warehouseManagementPerfectDelivery.vue

@@ -0,0 +1,505 @@
+// 完善入库信息
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="20">
+        <h2 class="bg-left title">完善出库信息</h2>
+      </el-col>
+      <el-col :span="4" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnNoComplete()"
+          >返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="center">
+      <h2>鲅鱼圈一号库 102仓位</h2>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList">
+        
+        <!--毛重（吨）-->
+        <ws-form-item label="毛重（吨）" span="1" prop="shippingType">
+          <ws-input
+            v-model="deptBudgetList.shippingType"
+            placeholder="请输入毛重"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--皮重（吨）-->
+        <ws-form-item label="皮重（吨）" span="1" prop="buyer" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.buyer"
+            placeholder="请输入皮重"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--净重（吨）-->
+        <ws-form-item label="净重（吨）" span="1" prop="settlementMethod">
+          <ws-input
+            v-model="deptBudgetList.settlementMethod"
+            placeholder="不可编辑，自动计算"
+            maxlength="120"
+            size="small"
+          />
+        </ws-form-item>
+        <!-- 品级 -->
+        <ws-form-item label="品级" span="1" class="readonly">
+          <ws-select
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <ws-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
+
+        <!--经办人-->
+        <ws-form-item label="经办人" span="1" prop="seller" class="readonly">
+          <ws-input
+            v-model="deptBudgetList.seller"
+            placeholder="请输入出库经办人姓名"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+        <!--出库日期-->
+        <ws-form-item
+          label="出库日期"
+          span="1"
+          prop="signingDate"
+          class="deliverydate"
+        >
+          <ws-date-picker
+            v-model="deptBudgetList.signingDate"
+            type="date"
+            placeholder="请选择出库日期"
+            value-format="yyyy-MM-dd"
+          />
+        </ws-form-item>
+        <!-- 出库类型 -->
+        <ws-form-item label="出库类型" span="1" class="readonly">
+          <ws-select
+            placeholder=""
+            class="typeselect"
+            @change="selectpackingMethod"
+          >
+            <ws-option
+              v-for="item in goodnameList"
+              :key="item.constKey"
+              :label="item.constValue"
+              :value="item.constValue"
+            />
+          </ws-select>
+        </ws-form-item>
+
+        <!--车牌号-->
+        <ws-form-item label="车牌号" span="1" prop="sourceGoods">
+          <ws-input
+            v-model="deptBudgetList.sourceGoods"
+            placeholder="请输入车牌号"
+            maxlength="20"
+            size="small"
+          />
+        </ws-form-item>
+
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          <ws-input
+            v-model.number="deptBudgetList.buyerPhone"
+            placeholder="请输入合同编号"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
+
+        <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="choice">
+          <h2>化验数据（选填）</h2>
+          <ws-info-table>
+            <!--自检员-->
+            <ws-form-item label="自检员" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入自检员姓名"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+
+            <!--水分（%）<=-->
+            <ws-form-item label="水分（%）<=" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入水分占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--杂质（%）<=-->
+            <ws-form-item label="杂质（%）<=" span="1" prop="settlementMethod">
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入杂质占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--容重（克/升）>=-->
+            <ws-form-item
+              label="容重（克/升）>="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入容重"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--霉变粒（%）<=-->
+            <ws-form-item
+              label="霉变粒（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入霉变粒占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--热损伤（%）<=-->
+            <ws-form-item
+              label="热损伤（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入热损伤占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+            <!--不完整粒（%）<=-->
+            <ws-form-item
+              label="不完整粒（%）<="
+              span="1"
+              prop="settlementMethod"
+            >
+              <ws-input
+                v-model="deptBudgetList.settlementMethod"
+                placeholder="请输入不完整粒占比"
+                maxlength="120"
+                size="small"
+              />
+            </ws-form-item>
+          </ws-info-table>
+        </div>
+
+        <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="submit()"
+            >提交</el-button
+          >
+        </div>
+      </ws-form>
+    </div>
+  </div>
+</template>
+<script>
+import { getList, export1, billoperatehis } from '@/model/contarct/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, EventBus } from 'base-core-lib'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    Pagination,
+  },
+  watch: {
+    vesselId(val) {
+      this.getList()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
+      searchKeyWord: '',
+      contractType: 2,
+      startDate: null,
+      endDate: null,
+      goodnameList: {},
+      // 提交类型
+      submitType: true,
+      selectpackingMethod: {},
+
+      appendixIdsAdd: {},
+      uploadSuccess: {},
+      onChange: {},
+
+      size: 10,
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      packtypeList: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+    }
+  },
+  activated() {
+    //cg.viewBudget
+    //cg.viewSpareMoney
+    // this.getVesselData();
+    this.getList()
+    this.showType = this.isShow
+  },
+  methods: {
+    //返回按钮
+    returnNoComplete() {
+      this.$router.push({ path: 'warehouseManagementNoComplete' })
+    },
+    //提交按钮
+    submit() {
+      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
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      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,
+      })
+        .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
+        })
+    },
+    selecttaskType(e) {
+      for (var i = 0; i < this.taskTypeList.length; i++) {
+        if (this.taskTypeList[i].value == e) {
+          this.searchType = this.taskTypeList[i].type
+        }
+      }
+    },
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        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
+        })
+    },
+    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() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  position: relative;
+  top: 50px;
+  width: 40%;
+  height: 2000px;
+  margin: 0 auto;
+}
+/deep/.el-form-item__label {
+  width: 160px;
+}
+/deep/.el-input--small {
+  width: 70%;
+}
+.container .bg-bottom {
+  position: absolute;
+  float: right;
+  top: 15px;
+  right: 20px;
+}
+//选填
+/deep/.el-form-item {
+  width: 50%;
+}
+.container {
+  overflow: scroll;
+  height: 120vh;
+}
+/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
+  text-align: center;
+}
+.deliverydate {
+  width: 35%;
+}
+.center[data-v-32a9842f] {
+  margin-top: -60px;
+}
+</style>

vue.config.js

@@ -144,9 +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.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址