前端临时库待完成出入库修改sdy

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1136,12 +1136,7 @@ export default {
         .then((response) => {
           this.gradeList = response
         })
-      // // 类型
-      // pullDown({ constId: 'CON6' })
-      //   .toPromise()
-      //   .then((response) => {
-      //     this.storageType = response
-      //   })
+
       // 类型
       if (this.deptBudgetList.warehouseType == 1) {
         // 货名

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -31,7 +31,8 @@
             alt=""
           />
           {{ this.$route.query.warehouseName }}库
-          <span class="position"> {{ this.$route.query.binNumber }}仓位 </span>
+          <span class="position" v-show="this.$route.query.warehouseType == 1"> {{ this.$route.query.binNumber }}仓位 </span>
+          <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <el-table :data="improved.records">
           <el-table-column type="index" label="序号">
@@ -342,7 +343,6 @@ export default {
     },
     //删除
       handleDelete(row) {
-      // console.log(row)
       this.$confirm(`删除后不可恢复，确认删除？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -356,7 +356,7 @@ export default {
                 title: '成功',
                 message: '删除成功',
               })
-              this.getList(row.baseId,row.positionId)
+              this.getList(row.baseId,row.positionId,this.$route.query.warehouseType)
             })
             .catch((response) => {
             })
@@ -366,17 +366,14 @@ export default {
         })
       }
   },
-  
   find() {
     this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
     this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
     this.currentPage = 1
     this.getList()
   },
- 
   // deletecontract(){},
   //删除
-
   approve() {},
   listQuery() {},
   total() {},

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -27,9 +27,12 @@
       <div class="basicInformation">
         <h2>
           {{ this.deptBudgetList1.warehouseName }}库
-          <span class="position">
+          <span class="position" v-show="this.$route.query.warehouseType == 1">
             {{ this.deptBudgetList1.binNumber }}仓位
           </span>
+           <span  v-show="this.$route.query.warehouseType == 2">
+             (临)
+          </span>
         </h2>
         <div class="small-title">基本信息</div>
         <ws-info-table>
@@ -143,7 +146,7 @@
               @change="selectstorageType"
             >
               <ws-option
-                v-for="item in storageType"
+                v-for="item in deliveryType"
                 :key="item.constKey"
                 :label="item.constValue"
                 :value="item.constValue"
@@ -853,18 +856,12 @@ export default {
         })
       // 类型
       if (this.$route.query.warehouseType == '1') {
-        pullDown({ constId: 'CON5' })
+        pullDown({ constId: 'CON6' })
           .toPromise()
           .then((response) => {
-            this.storageType = response
+            this.deliveryType = response
           })
       } else if (this.$route.query.warehouseType == '2') {
-        //临时库入库类型
-        pullDown({ constId: 'WARE1' })
-          .toPromise()
-          .then((response) => {
-            this.storageType = response
-          })
         //临时库出库类型
         pullDown({ constId: 'WARE2' })
           .toPromise()

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -26,7 +26,8 @@
       <div class="basicInformation">
         <h2>
           {{ deptBudgetList1.warehouseName }}库
-          <span class="position"> {{ deptBudgetList1.binNumber }}仓位 </span>
+          <span class="position" v-show="this.$route.query.warehouseType == 1"> {{ deptBudgetList1.binNumber }}仓位 </span>
+          <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <div class="small-title">基本信息</div>
         <ws-info-table>

vue.config.js

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