前端孟祥旭

src/views/warehouse/warehouseManagementDelivery.vue

@@ -1,9 +1,9 @@
-// 入库登记
+// 出库登记
 <template>
   <div class="container">
     <el-row>
       <el-col :span="20">
-        <h2 class="bg-left title">入库登记</h2>
+        <h2 class="bg-left title">出库登记</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
         <el-button
@@ -234,6 +234,13 @@
         </ws-form-item>
       </ws-info-table>
       <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom-up"
+          type="primary"
+          size="small"
+          @click="returnWarehouse()"
+          >暂存</el-button
+        >
         <el-button
           class="bg-bottom-up"
           type="primary"
@@ -367,6 +374,24 @@ export default {
         }
       })
     },
+    //暂存按钮
+    returnWarehouse() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
     tarechange(e) {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         this.deptBudgetList.netWeight = Number(

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -68,7 +68,7 @@
             @click="returnWarehouse()"
             >关闭</el-button
           >
-     
+          
         </div>
       <!-- </ws-form> -->
     </div>
@@ -179,7 +179,10 @@ export default {
           
            })
       }else if(row.inOutFlag==1){
-        this.$router.push({path:''})
+        this.$router.push({
+          path:'warehouseManagementPerfectDelivery',
+
+          })
         
       }
      

src/views/warehouse/warehouseManagementPerfectDelivery.vue

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

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -237,6 +237,13 @@
         </div>
 
         <div style="text-align: right; padding: 10px">
+          <el-button
+            class="bg-bottom-up"
+            type="primary"
+            size="small"
+            @click="returnWarehouse()"
+            >暂存</el-button
+          >
           <el-button
             class="bg-bottom-up"
             type="primary"
@@ -244,6 +251,7 @@
             @click="submit()"
             >提交</el-button
           >
+          
         </div>
       </ws-form>
     </div>
@@ -337,7 +345,7 @@ export default {
        this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.inOutFlag = 2
+          this.deptBudgetList.inOutFlag = 1
           addstorageputList(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -350,6 +358,24 @@ export default {
         }
       })
     },
+    // 暂存按钮
+    returnWarehouse() {
+       this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('暂存成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
     dateFormat(fmt, date) {
       let ret
       const opt = {

src/views/warehouse/warehouseManagementPut.vue

@@ -234,6 +234,13 @@
         </ws-form-item>
       </ws-info-table>
       <div style="text-align: right; padding: 10px">
+        <el-button
+          class="bg-bottom-up"
+          type="primary"
+          size="small"
+          @click="returnWarehouse()"
+          >暂存</el-button
+        >
         <el-button
           class="bg-bottom-up"
           type="primary"
@@ -368,6 +375,40 @@ export default {
         }
       })
     },
+    // 暂存按钮
+    returnWarehouse() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.statusFlag = 1
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },ubmit() {
+      this.$refs.deptBudgetList.validate((valid) => {
+        if (valid) {
+          this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
+          this.deptBudgetList.inOutFlag = 2
+          addstorageputList(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'warehouseManagementList' })
+            })
+        } else {
+          EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
+    },
     tarechange(e) {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         this.deptBudgetList.netWeight = Number(

vue.config.js

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