|  | @@ -34,8 +34,8 @@
 | 
	
		
			
				|  |  |            allowClear></v-select>
 | 
	
		
			
				|  |  |        </a-form-model-item>
 | 
	
		
			
				|  |  |        <a-form-model-item label="收货地址" prop="name">
 | 
	
		
			
				|  |  | -        {{chooseAddr}}
 | 
	
		
			
				|  |  | -        <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{addressVal}} >></a-button>
 | 
	
		
			
				|  |  | +        {{ chooseAddr }}
 | 
	
		
			
				|  |  | +        <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
 | 
	
		
			
				|  |  |        </a-form-model-item>
 | 
	
		
			
				|  |  |      </a-form-model>
 | 
	
		
			
				|  |  |      <div class="btn-cont">
 | 
	
	
		
			
				|  | @@ -48,68 +48,68 @@
 | 
	
		
			
				|  |  |  </template>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  | -  import { VSelect } from '@/components'
 | 
	
		
			
				|  |  | -  import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
 | 
	
		
			
				|  |  | -  export default{
 | 
	
		
			
				|  |  | -    name: 'BasicInfoModal',
 | 
	
		
			
				|  |  | -    components: { VSelect, chooseAddressModal },
 | 
	
		
			
				|  |  | -    props: {
 | 
	
		
			
				|  |  | -      openModal: { //  弹框显示状态
 | 
	
		
			
				|  |  | -        type: Boolean,
 | 
	
		
			
				|  |  | -        default: false
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  | -    data(){
 | 
	
		
			
				|  |  | -      return{
 | 
	
		
			
				|  |  | -        isShow: this.openModal, //  是否打开弹框
 | 
	
		
			
				|  |  | -        formItemLayout: {
 | 
	
		
			
				|  |  | -          labelCol: { span: 6 },
 | 
	
		
			
				|  |  | -          wrapperCol: { span: 16 }
 | 
	
		
			
				|  |  | -        },
 | 
	
		
			
				|  |  | -        form: {
 | 
	
		
			
				|  |  | -          name: '', // 仓库名称
 | 
	
		
			
				|  |  | -          sort: '',  //  排序
 | 
	
		
			
				|  |  | -        },
 | 
	
		
			
				|  |  | -        rules: {
 | 
	
		
			
				|  |  | -          name: [
 | 
	
		
			
				|  |  | -            { required: true, message: '请输入仓库名称', trigger: 'blur' }
 | 
	
		
			
				|  |  | -          ],
 | 
	
		
			
				|  |  | -        },
 | 
	
		
			
				|  |  | -        addressVal: '选择地址',  //  选择地址/更换地址
 | 
	
		
			
				|  |  | -        chooseAddr: '',  //  当前已选地址信息
 | 
	
		
			
				|  |  | -        openAddrModal: false, // 选择地址弹框是否显示
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  | -    methods: {
 | 
	
		
			
				|  |  | -      //  保存
 | 
	
		
			
				|  |  | -      handleSave(){
 | 
	
		
			
				|  |  | -        this.isShow = false
 | 
	
		
			
				|  |  | -        this.$emit('ok')
 | 
	
		
			
				|  |  | +import { VSelect } from '@/components'
 | 
	
		
			
				|  |  | +import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
 | 
	
		
			
				|  |  | +export default {
 | 
	
		
			
				|  |  | +  name: 'BasicInfoModal',
 | 
	
		
			
				|  |  | +  components: { VSelect, chooseAddressModal },
 | 
	
		
			
				|  |  | +  props: {
 | 
	
		
			
				|  |  | +    openModal: { //  弹框显示状态
 | 
	
		
			
				|  |  | +      type: Boolean,
 | 
	
		
			
				|  |  | +      default: false
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  | +  data () {
 | 
	
		
			
				|  |  | +    return {
 | 
	
		
			
				|  |  | +      isShow: this.openModal, //  是否打开弹框
 | 
	
		
			
				|  |  | +      formItemLayout: {
 | 
	
		
			
				|  |  | +        labelCol: { span: 6 },
 | 
	
		
			
				|  |  | +        wrapperCol: { span: 16 }
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  | -      //  选择地址
 | 
	
		
			
				|  |  | -      handleChoose(){
 | 
	
		
			
				|  |  | -        this.openAddrModal = true
 | 
	
		
			
				|  |  | +      form: {
 | 
	
		
			
				|  |  | +        name: '', // 仓库名称
 | 
	
		
			
				|  |  | +        sort: '' //  排序
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  | -      //  地址保存
 | 
	
		
			
				|  |  | -      handleOk(data){
 | 
	
		
			
				|  |  | -        this.chooseAddr = '张三(18800001111) 河南省 郑州市 中原区 大学科技园'
 | 
	
		
			
				|  |  | -        this.addressVal = '更换地址'
 | 
	
		
			
				|  |  | -        this.openAddrModal = false
 | 
	
		
			
				|  |  | -      }
 | 
	
		
			
				|  |  | -    },
 | 
	
		
			
				|  |  | -    watch: {
 | 
	
		
			
				|  |  | -      //  父页面传过来的弹框状态
 | 
	
		
			
				|  |  | -      openModal (newValue, oldValue) {
 | 
	
		
			
				|  |  | -        this.isShow = newValue
 | 
	
		
			
				|  |  | +      rules: {
 | 
	
		
			
				|  |  | +        name: [
 | 
	
		
			
				|  |  | +          { required: true, message: '请输入仓库名称', trigger: 'blur' }
 | 
	
		
			
				|  |  | +        ]
 | 
	
		
			
				|  |  |        },
 | 
	
		
			
				|  |  | -      //  重定义的弹框状态
 | 
	
		
			
				|  |  | -      isShow (newValue, oldValue) {
 | 
	
		
			
				|  |  | -        if (!newValue) {
 | 
	
		
			
				|  |  | -          this.$emit('close')
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | +      addressVal: '选择地址', //  选择地址/更换地址
 | 
	
		
			
				|  |  | +      chooseAddr: '', //  当前已选地址信息
 | 
	
		
			
				|  |  | +      openAddrModal: false // 选择地址弹框是否显示
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  | +  methods: {
 | 
	
		
			
				|  |  | +    //  保存
 | 
	
		
			
				|  |  | +    handleSave () {
 | 
	
		
			
				|  |  | +      this.isShow = false
 | 
	
		
			
				|  |  | +      this.$emit('ok')
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    //  选择地址
 | 
	
		
			
				|  |  | +    handleChoose () {
 | 
	
		
			
				|  |  | +      this.openAddrModal = true
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    //  地址保存
 | 
	
		
			
				|  |  | +    handleOk (data) {
 | 
	
		
			
				|  |  | +      this.chooseAddr = '张三(18800001111) 河南省 郑州市 中原区 大学科技园'
 | 
	
		
			
				|  |  | +      this.addressVal = '更换地址'
 | 
	
		
			
				|  |  | +      this.openAddrModal = false
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +  },
 | 
	
		
			
				|  |  | +  watch: {
 | 
	
		
			
				|  |  | +    //  父页面传过来的弹框状态
 | 
	
		
			
				|  |  | +    openModal (newValue, oldValue) {
 | 
	
		
			
				|  |  | +      this.isShow = newValue
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  | +    //  重定义的弹框状态
 | 
	
		
			
				|  |  | +    isShow (newValue, oldValue) {
 | 
	
		
			
				|  |  | +      if (!newValue) {
 | 
	
		
			
				|  |  | +        this.$emit('close')
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  | +}
 | 
	
		
			
				|  |  |  </script>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <style lang="less">
 |