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

src/views/contractManagement/purchaseContractAdd.vue

@@ -240,6 +240,7 @@
           prop="unitContractPrice"
         >
           <ws-input
+            @input="pricechange"
             v-model="deptBudgetList.unitContractPrice"
             placeholder="请输入合同单价"
             maxlength="100"
@@ -609,6 +610,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -692,6 +694,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     returnsales() {
       this.$router.push({ path: 'buyContract' })
     },
@@ -1334,6 +1339,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },

src/views/contractManagement/salesContractAdd.vue

@@ -258,6 +258,7 @@
             prop="unitContractPrice"
           >
             <ws-input
+              @input="pricechange"
               v-model="deptBudgetList.unitContractPrice"
               placeholder="请输入合同单价"
               maxlength="100"
@@ -621,6 +622,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -1319,6 +1321,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },
@@ -1425,6 +1428,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     // 编辑
     editClick(item, index) {
       const map = JSON.parse(JSON.stringify(item))

src/views/warehouse/warehouseManagementDelivery.vue

@@ -24,7 +24,7 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <h2>
-          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.warehouseName }}
           <span
             class="position"
             v-show="this.deptBudgetList.warehouseType == 1"

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -30,7 +30,7 @@
             src="../../../public/img/cangku.png"
             alt=""
           />
-          {{ this.$route.query.warehouseName }}库
+          {{ this.$route.query.warehouseName }}
           <span class="position" v-show="this.$route.query.warehouseType == 1">
             {{ this.$route.query.binNumber }}仓位
           </span>

src/views/warehouse/warehouseManagementPut.vue

@@ -33,7 +33,7 @@
             src="../../../public/img/cangku.png"
             alt
           />
-          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.warehouseName }}
           <span class="position" v-show="this.$route.query.warehouseType == 1"
             >{{ deptBudgetList.binNumber }}仓位</span
           >
@@ -271,6 +271,7 @@
               placeholder
               class="typeselect"
               @change="selectstorageType"
+              :disabled="isSelectType"
             >
               <ws-option
                 v-for="item in storageType"
@@ -539,6 +540,7 @@ export default {
   },
   data() {
     return {
+      isSelectType:true,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -618,7 +620,7 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted() {
+  mounted() {debugger
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
@@ -628,13 +630,13 @@ export default {
     this.getList()
     this.deptBudgetList.grade = '一等品'
     this.deptBudgetList.gradeKey = '1'
-    if (this.deptBudgetList.warehouseType == 1) {
-      this.deptBudgetList.inOutType = '采购入库'
-      this.deptBudgetList.inOutTypeKey = '1'
-    } else {
-      this.deptBudgetList.inOutType = '退库'
-      this.deptBudgetList.inOutTypeKey = '1'
-    }
+    // if (this.deptBudgetList.warehouseType == 1) {
+    //   this.deptBudgetList.inOutType = '采购入库'
+    //   this.deptBudgetList.inOutTypeKey = '1'
+    // } else {
+    //   this.deptBudgetList.inOutType = '退库'
+    //   this.deptBudgetList.inOutTypeKey = '1'
+    // }
   },
   methods: {
     uploadSuccessHandle1(res) {
@@ -1756,12 +1758,18 @@ export default {
         )
       }
     },
-    contractNoChange(e) {
+    contractNoChange(e) {debugger
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+          if(this.outContractNo[i].inOutType=='移库入库'){
+            this.isSelectType = false
+          }else{
+            this.isSelectType = true
+          }
           if (this.outContractNo[i].tranCarInfoList) {
             this.options2 = this.outContractNo[i].tranCarInfoList
             this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
@@ -1837,10 +1845,16 @@ export default {
         })
       // 类型
       if (this.deptBudgetList.warehouseType == '1') {
+        this.storageType = []
         pullDown({ constId: 'CON5' })
           .toPromise()
-          .then((response) => {
-            this.storageType = response
+          .then((response) => {debugger
+            // this.storageType = response
+            for(let i = 0;i<response.length;i++){
+                if(response[i].constValue=='移库入库'||response[i].constValue=='退库'){
+                  this.storageType.push(response[i])
+                }
+            }
           })
       } else if (this.deptBudgetList.warehouseType == '2') {
         pullDown({ constId: 'WARE1' })