Merge branch 'master' into stage

src/components/process/SendFunds.vue

@@ -605,8 +605,7 @@ const getDictData = () => {
     accountData.value = res.rows;
   });
   // 关联合同
-
-  proxy.post("/contract/page", { pageNum: 1, pageSize: 9999, status: 30 }).then((res) => {
+  proxy.post("/contract/page1", { pageNum: 1, pageSize: 9999, status: 30 }).then((res) => {
     contractList.value = res.rows;
   });
   // 部门树

src/views/purchaseManage/supplier/supplier/index.vue

@@ -498,8 +498,12 @@ const getDtl = (row) => {
             };
           });
         }
-        getCityData(res.countryId, "20");
-        getCityData(res.provinceId, "30");
+        if (res.countryId) {
+          getCityData(res.countryId, "20");
+        }
+        if (res.provinceId) {
+          getCityData(res.provinceId, "30");
+        }
         res.type = res.type + "";
         formData.data = res;
         dialogVisible.value = true;