1

pages/receivinggoods/receivinggoods.js

@@ -22,6 +22,7 @@ Page({
       index:-1,//初始选中位置（入仓表格）
       index:-1,//初始选中位置（入仓表格）
       isShowMask1:false,//是否展示弹窗（城市弹窗）
       isShowMask1:false,//是否展示弹窗（城市弹窗）
       errorText:false,//是否显示错误信息（入仓号不存在）
       errorText:false,//是否显示错误信息（入仓号不存在）
+      isDisableCountry:false,
       list1:[],//头部的表格数据
       list1:[],//头部的表格数据
       errorArr:[],
       errorArr:[],
       list2:[],//底部左边的表格数据
       list2:[],//底部左边的表格数据
@@ -619,7 +620,6 @@ onUnload:function(){
         me.setData({
         me.setData({
           list1:dataArr
           list1:dataArr
         })
         })
-        console.log(dataArr)
         
         
       } else {
       } else {
         wx.showToast({
         wx.showToast({
@@ -921,7 +921,6 @@ onUnload:function(){
         });
         });
         me.getList1(false);
         me.getList1(false);
         me.getReceivingList(1);
         me.getReceivingList(1);
-      
         if(me.data.formData.wldy == 1){
         if(me.data.formData.wldy == 1){
           console.log('打印物料标签')
           console.log('打印物料标签')
           let formData = me.data.formData;
           let formData = me.data.formData;
@@ -946,6 +945,7 @@ onUnload:function(){
           "PRINT";
           "PRINT";
            me.initBlue(1,data)
            me.initBlue(1,data)
         }
         }
+        me.clearFun();
       }else{
       }else{
         wx.showToast({
         wx.showToast({
           title: res.errmsg,
           title: res.errmsg,
@@ -974,6 +974,7 @@ onUnload:function(){
     this.setData({
     this.setData({
       formData:obj,
       formData:obj,
       searchByXh:"",
       searchByXh:"",
+      isDisableCountry:false
     });
     });
     if(isBtn){
     if(isBtn){
       this.setData({
       this.setData({
@@ -1011,12 +1012,23 @@ onUnload:function(){
     this.setData({
     this.setData({
       ["formData.xh"]:dataObj.goods_name,
       ["formData.xh"]:dataObj.goods_name,
       ["formData.pp"]:dataObj.brand_name,
       ["formData.pp"]:dataObj.brand_name,
-      ["formData.cd"]:dataObj.country_name,
+      // ["formData.cd"]:dataObj.country_name,
       ["formData.tm"]:val,
       ["formData.tm"]:val,
       ["formData.wldy"]:dataObj.is_print,
       ["formData.wldy"]:dataObj.is_print,
       ["formData.jlpc"]:dataObj.is_record_batch_dc,
       ["formData.jlpc"]:dataObj.is_record_batch_dc,
       searchByXh:dataObj
       searchByXh:dataObj
     });
     });
+    if(dataObj.receiving_country){
+        this.setData({
+          "isDisableCountry":true,
+          ["formData.cd"]:dataObj.receiving_country.country.country,
+        })
+    }else{
+      this.setData({
+        "isDisableCountry":false,
+        ["formData.cd"]:dataObj.country_name,
+      })
+    }
     this.dealErrorArr('型号查找成功，请扫描数量条码')
     this.dealErrorArr('型号查找成功，请扫描数量条码')
   },
   },
   judgeCountry:function(val,callBack){
   judgeCountry:function(val,callBack){
@@ -1064,7 +1076,7 @@ onUnload:function(){
   },
   },
   showMask1Fun:function(){
   showMask1Fun:function(){
     //展示城市弹窗
     //展示城市弹窗
-    if(this.data.countryList.length){
+    if(this.data.countryList.length&&!this.data.isDisableCountry){
       this.setData({
       this.setData({
         isShowMask1:true
         isShowMask1:true
       })
       })

pages/receivinggoods/receivinggoods.wxml

@@ -91,7 +91,7 @@
 					</view>
 					</view>
 					<view class="form-bottom-center-view Bflex aic">
 					<view class="form-bottom-center-view Bflex aic">
 						<text class="label">产地</text>
 						<text class="label">产地</text>
-						<input class="input input-border address-input" bindinput="formcdInput" value="{{formData.cd}}" confirm-type="done"></input>
+						<input class="input input-border address-input  {{isDisableCountry?'disabled':'' }}" bindinput="formcdInput" value="{{formData.cd}}" confirm-type="done" disabled="{{isDisableCountry}}"></input>
 						<image class="search-icon" src="../../res/img/search-icon.png" catchtap="showMask1Fun"></image>
 						<image class="search-icon" src="../../res/img/search-icon.png" catchtap="showMask1Fun"></image>
 					</view>
 					</view>
 					<view class="form-bottom-center-view Bflex aic">
 					<view class="form-bottom-center-view Bflex aic">