Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	src/views/outboundManagement/weighingManagementNew.vue

.env.production

@@ -4,8 +4,8 @@
 
 NODE_ENV = 'production'
 # base api
-#VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
-VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
+VUE_APP_BASE_API = 'https://api2.eliangeyun.com'
+#VUE_APP_BASE_API = 'https://apitest.eliangeyun.com'
 
 # 微服务相关接口配置
 ## 任务消息

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -73,7 +73,7 @@
                     <el-option v-for="item in goodnameList" :key="'huoming'+item.id" :label="item.goodsName" :value="item.goodsName" />
                   </el-select>
                 </ws-form-item>
-                 <ws-form-item v-if='serviceManagementType==3' label="类型" span="1" prop="type">
+                 <ws-form-item  label="类型" span="1" prop="type">
                   <ws-select v-model="deptBudgetList.type" disabled>
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
                   </ws-select>
@@ -410,7 +410,7 @@
         customerName:'',
         customerPhone:'',
         deptBudgetList:{
-          type: '',
+          type: '干粮',
           freight: 0,
           cost: '',
           addressUrl: '',
@@ -527,7 +527,7 @@
     },
     activated(){
        this.selectWarehouse()
-       var _saomaData = JSON.parse(localStorage.getItem("saoma_data"))
+       var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
        if(_saomaData){//缓存中有值，证明扫码进来的
          this.warehouseName = _saomaData.warehouseName
          this.warehouseNameChange(this.warehouseName)
@@ -535,14 +535,14 @@
          ids.id = _saomaData.id
          this.listclick(ids)
           if(_saomaData.type == 1){
-         this.statusTypetext = "初检"
+         this.statusTypetext = '初检'
        }else if(_saomaData.type == 2){
-         this.statusTypetext = "确认"
+         this.statusTypetext = '确认'
        }else if(_saomaData.type == 3){
-         this.statusTypetext = "复检"
+         this.statusTypetext = '复检'
        }
        this.serviceManagementType = _saomaData.managementType
-         localStorage.removeItem("saoma_data");//第一次进来结束后清除缓存
+         localStorage.removeItem('saoma_data');//第一次进来结束后清除缓存
        }else{
           let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
           _WarehouseName = JSON.parse(_WarehouseName)

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -740,6 +740,7 @@
             this.setCurrent(this.mList[0])
 
             this.weighingList = this.mList[0]
+            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.mList[0].carNumber,
               type: this.information,
@@ -756,7 +757,6 @@
             this.weighingList.inOutType = this.pList[0].qualityInspectionManagement.inOutType
             this.weighingList.inOutTypeKey = this.pList[0].qualityInspectionManagement.inOutTypeKey
             this.weighingList.deductionAmount = this.pList[0].qualityInspectionManagement.deductionAmount
-            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.pList[0].carNumber,
               type: this.information,
@@ -1400,21 +1400,47 @@
                       id: this.weighingList.warehouseInOutId
                     }).toPromise().then((response) => {
                       that.inOutDate = response
-                      warehousing.statusFlag = 3
-                      warehousing.grossWeight /= 1000
-                      warehousing.tare /= 1000
-                      warehousing.netWeight /= 1000
-                      warehousing.pureWeight = 1000
-                      warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
-                      warehousing.deductionWeight /= 1000
-                      warehousing.inOutFlag = 2
-                      console.log(that.weighingList)
-                      warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      warehousing.inOutType = that.weighingList.inOutType
-                      warehousing.deductionAmount = that.weighingList.deductionAmount
-                      warehousing.id = warehousing.warehouseInOutId
+                      that.$set(that.inOutDate,'statusFlag',3)
+                      that.$set(that.inOutDate,'grossWeight',warehousing.grossWeight /1000)
+                      that.$set(that.inOutDate,'tare',warehousing.grossWeight /1000)
+                      that.$set(that.inOutDate,'netWeight',warehousing.netWeight /1000)
+
+                      // that.$set(that.inOutDate,'pureWeight',warehousing.pureWeight /1000)
+                      that.$set(that.inOutDate,'deductionAmount',Number(warehousing.deductionAmount) * 1000)
+                      that.$set(that.inOutDate,'deductionWeight',warehousing.deductionWeight /1000)
+                      that.$set(that.inOutDate,'inOutFlag',2)
+                      // that.inOutDate = response
+                      // that.$set(that.inOutDate)
+                      // .statusFlag = 3
+                      // that.inOutDate.grossWeight=warehousing.grossWeight /1000
+                      // that.inOutDate.tare=warehousing.tare /1000
+                      // that.inOutDate.netWeight=warehousing.netWeight /1000
+                      // that.inOutDate.pureWeight=warehousing.pureWeight /1000
+                      // that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
+                      // that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
+                      // that.inOutDate.inOutFlag = 2
+                      console.log(that.inOutDate)
+                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      // warehousing.inOutType = that.weighingList.inOutType
+                      // warehousing.deductionAmount = that.weighingList.deductionAmount
+                      // warehousing.positionId = that.weighingList.positionId
+                      // warehousing.id = warehousing.warehouseInOutId
+                      // warehousing.statusFlag = 3
+                      // warehousing.grossWeight /= 1000
+                      // warehousing.tare /= 1000
+                      // warehousing.netWeight /= 1000
+                      // warehousing.pureWeight = 1000
+                      // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
+                      // warehousing.deductionWeight /= 1000
+                      // warehousing.inOutFlag = 2
+                      // console.log(that.inOutDate)
+                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      // warehousing.inOutType = that.weighingList.inOutType
+                      // warehousing.deductionAmount = that.weighingList.deductionAmount
+                      // // warehousing.positionId = that.weighingList.positionId
+                      // warehousing.id = warehousing.warehouseInOutId
                       // delete that.inOutDate.status
-                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
                     })
                   }

src/views/outboundManagement/weighingManagementNew.vue

@@ -877,7 +877,7 @@
                         })
                         toPromise().then((response) => {
                           if (this.reader) {
-                            this.reader.cancel()
+    	                   this.reader.cancel()
                           }
                           this.$notify({
                             title: '成功',
@@ -1042,6 +1042,17 @@
                   grossWeight(this.weighingList)
                     .toPromise()
                     .then((response) => {
+						 getweighing({
+                            id: response
+                          })
+                          .toPromise()
+                          .then((response) => {
+                            this.weighingList = response
+                            this.inspect = JSON.parse(
+                              JSON.stringify(this.weighingList)
+                            )
+                            this.isShowPrint = true
+                          })
                       if (this.reader) {
                         this.reader.cancel()
                       }
@@ -1105,7 +1116,28 @@
         }
       },
       tabClick(val) {
-        this.weighingList = []
+        this.weighingList = {
+            grossWeight: 0,
+            tare: 0,
+            tips: '',
+            buckleMiscellaneous: 0,
+            netWeight: 0,
+            receivableWeighingFee: '',
+            warehouseInOutDetail: {
+				grade: '',
+				imperfectGrain: '',
+				impurity: '',
+				jiaorenli: '',
+				bulkDensity: '',
+				mildewGrain: '',
+            },
+			qualityInspectionManagement: {
+                boxNo: '暂无',
+                boxNoOther: '暂无',
+                titleNo: '暂无',
+                titleNoOther: '暂无',
+			},
+        }
         this.index = val
         // this.disabled=true
         if (val == 0) {

src/views/warehouse/warehouseManagementRecord.vue

@@ -509,6 +509,9 @@
       this.getList()
       this.getPassYearFormatDate()
       this.showType = this.isShow
+      if(this.binNumber == '全部仓位'){
+        this.deptBudgetList.positionId = ''
+      }
     },
     updated() {
       this.$nextTick(() => {