gjy 3 years ago
parent
commit
76febe684b

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

+ 22 - 21
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -235,7 +235,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -338,10 +338,10 @@
           netWeight: 0,
           receivableWeighingFee: '',
           qualityInspectionManagement: {
-            boxNo: "暂无",
-            boxNoOther: "暂无",
-            titleNo: "暂无",
-            titleNoOther: "暂无",
+            boxNo: '暂无',
+            boxNoOther: '暂无',
+            titleNo: '暂无',
+            titleNoOther: '暂无',
           }
         },
         deptBudgetList: {},
@@ -372,9 +372,9 @@
         mListTotal: [],
         pListTotal: [],
         submitAllow: false,
-        id: "",
+        id: '',
         inOutDate: {},
-        idPrint:"",
+        idPrint:'',
         ewCustomerOptions: [{
             value: '黑龙江利润元粮食贸易有限公司',
             label: '黑龙江利润元粮食贸易有限公司'
@@ -406,8 +406,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
          ewradio: '',
         ddchecked: false,
         checked: false,
@@ -432,7 +432,7 @@
       // }
       //  if (this.$route.query.automaticWeightAcquisition == '1') {
       this.isShowBalance = true
-      var _saomaData = JSON.parse(localStorage.getItem("saoma_data")) //判断是否扫码进来的
+      var _saomaData = JSON.parse(localStorage.getItem('saoma_data')) //判断是否扫码进来的
       // }
       //仓库
       selectWarehouseSelf({
@@ -450,7 +450,7 @@
             this.id = _saomaData.id
             this.tpyeNo = _saomaData.typeNo
             this.inWarehouseType = _saomaData.managementType
-            localStorage.removeItem("saoma_data"); //第一次进来结束后清除缓存
+            localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
           } else if ( localStorage.getItem('houseSelfCollect_house1')) {
             this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
             for (var i = 0; i < response.length; i++) {
@@ -701,7 +701,7 @@
               _list[i].paymentManagement.approveStatus
             ) {
               continue
-            }y
+            }
           }
           if (_list[i].status == '已质检') {
             this.mListTop.push(_list[i])
@@ -987,7 +987,8 @@
       },
       handleCurrentChange(val) {
         this.submitAllow = false
-        if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0) {
+        if (this.tpyeNo == 2 && this.status == 1 && val && val.qualityInspectionManagement.confirm == 0
+        ) {
           this.submitAllow = true
           this.$message({
             message: '该条质检信息未确认',
@@ -1181,7 +1182,7 @@
         }
           if(this.tpyeNo == 2) {
               if(this.submitAllow){
-                this.$message.error("该条质检信息未确认")
+                this.$message.error('该条质检信息未确认')
                 return
               }
         }
@@ -1280,9 +1281,9 @@
                               warehousing.inOutFlag = 
                               warehousing.id=warehousing.warehouseInOutId
                               addstorageputList(warehousing).toPromise().then((response) => {
-                                // if(response == "OK"){
-                                //   this.getList()
-                                // }
+                                if(response == 'OK'){
+                                  this.getList()
+                                }
                               })
                             }
                           })
@@ -1318,9 +1319,9 @@
                       delete warehousing.status
                       warehousing.id=warehousing.warehouseInOutId
                       addstorageputList(warehousing).toPromise().then((response) => {
-                        // if(response == "OK"){
-                        //   this.getList()
-                        // }
+                        if(response == 'OK'){
+                          this.getList()
+                        }
                       })
                     }
                   })
@@ -1344,7 +1345,7 @@
                     message: '保存成功',
                   })
                   this.idPrint = response
-                  // this.isShowPrintType = true
+                  this.isShowPrintType = true
                   this.getList()
                   
                   //贸易入库需要再走入库接口

+ 7 - 7
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -94,7 +94,7 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -163,12 +163,12 @@
         deptCircularPage: {},
         deptBudgetTotal: 0,
         warehouseList: [], //仓库
-        searchKeyWord: "",
+        searchKeyWord: '',
         choice: '',
         warehousingType: 1,
         isShowPrint:false,
         dialogData:{},
-        title:"",
+        title:'',
         modification:[],
         ewCustomerOptions: [{
             value: '黑龙江利润元粮食贸易有限公司',
@@ -201,8 +201,8 @@
           label: '厦门建发物产有限公司'
         }],
         companyName: '黑龙江利润元粮食贸易有限公司',
-        companyNameEW: "厦门建发物产有限公司",
-        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+        companyNameEW: '厦门建发物产有限公司',
+        ewCustomer: '黑龙江利润元粮食贸易有限公司',
          ewradio: '',
         ddchecked: false,
         checked: false,
@@ -301,7 +301,7 @@
                 this.dialogData.companyName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
-              this.printBig("", this.radio)
+              this.printBig('', this.radio)
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -347,7 +347,7 @@
       //打印
         if (type == 1) {
             if(this.modification.length == 0){
-              this.$message.error("请选择批量打印的条目!")
+              this.$message.error('请选择批量打印的条目!')
               return
             }
           this.isShowPrintType = true

+ 3 - 4
src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -109,13 +109,13 @@
               <el-table-column property="status" label="状态">
               </el-table-column>
             </el-table>
-            <div style="text-align: center">
+            <div style="text-align: center" v-if="inspectbtn == 1">
               <el-pagination class='switchpage' @size-change="handleSizeChange" @current-change="handleCurrentChange"
                 :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                 :total="deptBudgetTotal1">
               </el-pagination>
             </div>
-             <div style="text-align: center" v-if="inspectbtn == 2"  class="paging">
+             <div style="text-align: center" v-if="inspectbtn == 2">
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
                 :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                 :total="deptBudgetTotal2">
@@ -335,9 +335,8 @@
          }
         }else{
           this.inspect = {}
+          this.inspect.weighingManagement={}
         }
-        
-        this.deptBudgetTotal =  this.switchList.length
 
       },
        handleSizeChange(val) {