优化

src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -155,12 +155,17 @@
             </el-col>
             <el-col :span="8">
               <el-form-item
-                label="是否存在上级集团公司"
-                prop="hasParentGroup"
-                label-width="155px"
+                label="关联上级单位"
+                prop="parentId"
+             
               >
-                <el-radio v-model="form.hasParentGroup" :label="1">是</el-radio>
-                <el-radio v-model="form.hasParentGroup" :label="0">否</el-radio>
+              <el-input
+                  placeholder="请选择关联上级单位"
+                  v-model="form.parentName"
+                  readonly
+                  @click.native="handParent"
+               
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -396,6 +401,8 @@
       <el-button type="primary" @click="save">保存</el-button>
       <el-button @click="cancel">返回</el-button>
     </div>
+
+    <parentList ref="parentRef" classType="2" @changeParent="changeParent"></parentList>
   </ele-modal>
 </template>
 
@@ -410,6 +417,8 @@ import personSelect from '@/components/CommomSelect/person-select.vue';
 import {listOrganizations} from '@/api/system/organization';
 import {copyObj} from '@/utils/util';
 
+import parentList from '../../../saleManage/contact/components/parentList.vue'
+
 
 export default {
     props: {
@@ -419,7 +428,8 @@ export default {
     components: {
       fileUpload,
       deptSelect,
-      personSelect
+      personSelect,
+      parentList
     },
     data() {
       let formDef = {
@@ -433,7 +443,7 @@ export default {
           categoryId: '',
           companyCategoryId: '',
           companyCategoryName: '',
-          hasParentGroup: 0,
+          parentId: null,
           industry: '',
           industryCode: '',
           industryFullName: '',
@@ -594,6 +604,10 @@ export default {
           ],
           authorizationLimit: [
             { required: true, message: '请输入授信额度', trigger: 'blur' }
+          ],
+
+          addressId: [
+          { required: true, message: '请选择地址', trigger: 'change' }
           ]
         },
         otherRules: {
@@ -602,7 +616,25 @@ export default {
           // ],
           taxRate: [
             { required: true, message: '请输入税率', trigger: 'change' }
+          ],
+
+          
+          sender: [
+          { required: true, message: '请输入收件人', trigger: 'change' }
+          ],
+
+          senderPhone: [
+          { required: true, message: '请输入收件人电话', trigger: 'change' }
+          ],
+
+          addressId: [
+          { required: true, message: '请选择收件人地址', trigger: 'change' }
+          ],
+
+          address: [
+          { required: true, message: '请输入收件人详细地址', trigger: 'blur' }
           ]
+
         },
         options: {
           cityData,
@@ -882,6 +914,20 @@ export default {
         }
       },
 
+      handParent() {
+        let item = {
+          id:  this.form.parentId
+        }
+        this.$refs.parentRef.open(item)
+      },
+
+      changeParent(obj) {
+        this.$set( this.form, 'parentId',  obj.id)
+        this.$set( this.form, 'parentName',  obj.name)
+
+      }
+
+
     }
   };
 </script>

src/views/saleManage/contact/components/addContactDialog.vue

@@ -403,7 +403,7 @@
       <el-button @click="cancel">返回</el-button>
     </div>
 
-    <parentList ref="parentRef" @changeParent="changeParent"></parentList>
+    <parentList ref="parentRef" classType="1" @changeParent="changeParent"></parentList>
 
   </ele-modal>
   

src/views/saleManage/contact/components/parentList.vue

@@ -47,6 +47,12 @@ export default {
         ContactSearch,
         AssetTree
     },
+    props: {
+        classType: {
+            type: Number,
+            default: 1
+        }
+    },
     data() {
         return {
             visible: false,
@@ -55,12 +61,12 @@ export default {
 
             columns: [
 
-            {
-          action: 'action',
-          slot: 'action',
-          align: 'center',
-          label: '选择'
-        },
+                {
+                    action: 'action',
+                    slot: 'action',
+                    align: 'center',
+                    label: '选择'
+                },
                 {
                     columnKey: 'index',
                     label: '序号',
@@ -149,7 +155,7 @@ export default {
     methods: {
         open(item) {
             if (item) {
-            
+
                 this.radio = item.id
             }
             this.visible = true
@@ -161,7 +167,7 @@ export default {
             return contactPage({
                 pageNum: page,
                 size: limit,
-                type: 1,
+                type: this.classType,
                 ...where
             });
         },