Ver Fonte

前端sdy

zhongtianhaoyuan há 4 anos atrás
pai
commit
f5cc3aa169

+ 5 - 1
src/views/warehouse/warehouseManagementDelete.vue

@@ -35,8 +35,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="warehouseName" label="仓库名称">
+
         </el-table-column>
-        <el-table-column prop="warehouseCity" label="仓库所在地">
+        <el-table-column prop="warehousePrivate" label="仓库所在地">
+          <template scope="scope">
+            {{scope.row.warehousePrivate}}{{scope.row.warehouseCity}}{{scope.row.warehouseArea}}
+          </template>
         </el-table-column>
         <el-table-column prop="residual" label="应余库存(吨)">
         </el-table-column>

+ 8 - 9
src/views/warehouse/warehouseManagementIoss.vue

@@ -279,6 +279,7 @@ export default {
   methods: {
     //返回按钮
     returnWarehouse() {
+       this.deptBudgetList.goodsName = ""
       this.$router.push({ path: 'warehouseManagementList' })
     },
     //提交按钮
@@ -319,6 +320,7 @@ export default {
             .toPromise()
             .then((response) => {
               this.$message.success('提交成功')
+              this.deptBudgetList.goodsName = ""
               this.$router.push({ path: 'warehouseManagementList' })
             })
         } else {
@@ -363,14 +365,11 @@ export default {
       this.getList()
     },
     changeioss(e) {
-  
       if(!this.deptBudgetList.baseId){
         this.deptBudgetList.baseId = this.$route.query.baseId
         this.deptBudgetList.positionId = this.deptBudgetList1.positionId
         this.deptBudgetList.binNumber = this.deptBudgetList1.binNumber
       }
-      console.log(this.deptBudgetList)
-    console.log(this.deptBudgetList.positionId)
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].goodsName == e) {
           this.deptBudgetList.goodsNameKey = this.goodnameList[i].goodsNameKey
@@ -386,6 +385,7 @@ export default {
         })
     },
     loaddata() {
+     
       // 货名
       goodsname({ positionId: this.$route.query.positionId })
         .toPromise()
@@ -413,13 +413,12 @@ export default {
     //     })
     // },
 
-    // deletecontract(){},
     //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {},
+    // approve() {},
+    // listQuery() {},
+    // total() {},
+    // clearfiltQuery() {},
+    // selectCrtDuty() {},
   },
 }
 </script>

+ 1 - 0
src/views/warehouse/warehouseManagementList.vue

@@ -258,6 +258,7 @@ export default {
     },
     //入库
     warehousing(item) {
+     
       var free = 0
       for (var i = 0; i < item.warehouseNumViewList.length; i++) {
         free += Number(item.warehouseNumViewList[i].storage)

+ 2 - 0
src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -79,6 +79,7 @@
           <!--净重(吨)-->
           <ws-form-item label="净重(吨)" span="1" prop="netWeight">
             <ws-input
+            :readonly="readonly"
               v-model.number="dataList.netWeight"
               placeholder="不可编辑,自动计算"
               type="number"
@@ -303,6 +304,7 @@ export default {
       showType: true,
       // 年
       year: '',
+      readonly:true,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,

+ 3 - 1
src/views/warehouse/warehouseManagementPerfectput.vue

@@ -76,6 +76,7 @@
           <!--净重(吨)-->
           <ws-form-item label="净重(吨)" span="1" prop="netWeight">
             <ws-input
+            :readonly="readonly"
               v-model.number="dataList.netWeight"
               placeholder="不可编辑,自动计算"
               type="number"
@@ -305,6 +306,7 @@ export default {
       // 年
       year: '',
       deptBudgetTotal: 0,
+      readonly:true,
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
@@ -745,7 +747,7 @@ export default {
   background-color: #f6f7fc;
 }
 /deep/.neifor .el-input--small .el-input__inner {
-  width: 120%;
+  width: 100%;
 }
 .el-input__inner {
   width: 150px;