完善存放地点

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@@ -63,7 +63,7 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty"><span class="icon">*</span>详细地址</div>
-            <el-form-item prop="warehouseAttribute">
+            <el-form-item prop="county">
               <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
                 <el-select v-model="formobj.province" filterable clearable placeholder="请选择省" style="width:160px" @change="provinceChange">
                   <el-option v-for="item in province_list" :key="item.sid" :label="item.name" :value="item.name"/>
@@ -71,7 +71,7 @@
                 <el-select v-model="formobj.city" filterable placeholder="请选择市" style="width:160px" @change="cityChange">
                   <el-option v-for="item in city_list" :key="item.sid" :label="item.name" :value="item.name"/>
                 </el-select>
-                <el-select v-model="formobj.county" filterable placeholder="请选择县" style="width:160px" @change="countyChange">
+                <el-select v-model="formobj.county" filterable placeholder="请选择区/县" style="width:160px" @change="countyChange">
                   <el-option v-for="item in county_list" :key="item.sid" :label="item.name" :value="item.name"/>
                 </el-select>
                 <el-input style="width: 30%" v-model="formobj.warehouseAttribute" clearable placeholder="请填写存放地点营业执照上的公司详细地址"/>
@@ -125,7 +125,7 @@ export default {
       rules: {
         gressionCode: [{ required: true, message: '编码不能为空', trigger: 'blur' }], // 编码
         warehouseName: [{ required: true, message: '名称不能为空', trigger: 'blur' }], // 名称
-        warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], // 存放地点属性
+        county: [{ required: true, message: '省、市、区/县及详细地址不能为空', trigger: 'blur' }], // 存放地点属性
         warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], // 存放地点负责人
         warehouseGroupKey: [{ required: true, message: '分组不能为空', trigger: 'change' }], // 分组
         libTubeSid: [{ required: true, message: '库管人员不能为空', trigger: 'change' }]
@@ -248,6 +248,10 @@ export default {
     saveAdd() {
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
+          if (this.formobj.warehouseAttribute === '') {
+            this.$message({ showClose: true, type: 'error', message: '区/县后的详细地址不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.saveAdd(this.formobj).then(resp => {
             if (resp.success) {
@@ -265,6 +269,10 @@ export default {
     saveEdit() {
       this.$refs['form_obj'].validate(valid => {
         if (valid) {
+          if (this.formobj.warehouseAttribute === '') {
+            this.$message({ showClose: true, type: 'error', message: '区/县后的详细地址不能为空' })
+            return
+          }
           this.submitdisabled = true
           req.saveEdit(this.formobj, this.formobj.sid).then(resp => {
             if (resp.success) {