ccjgmwz 3 gadi atpakaļ
vecāks
revīzija
5c81672878

+ 2 - 2
.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'
 
 # 微服务相关接口配置
 ## 任务消息

+ 7 - 7
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)

+ 3 - 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(() => {