Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/components/byForm/index.vue

@@ -520,9 +520,16 @@ loadInit();
 }
 .by-form .el-form--inline .el-form-item {
   margin-right: 0px;
-  padding: 0 10px;
+  
   box-sizing: border-box;
 }
+.by-form .el-form--inline>.el-form-item{
+  padding: 0 10px;
+}
+
+/* .el-form--inline.el-form--label-top{
+  justify-content: space-between;
+} */
 
 .dn {
   display: none !important;

src/views/publicModule/companyConfig/index.vue

@@ -35,15 +35,15 @@
           </div>
         </template>
         <template #allAddress>
-          <el-row style="width: 100%">
-            <el-col :span="8">
+          <el-row style="width: 100%;display: flex;justify-content: space-between;">
+            <el-col :span="7">
               <el-form-item prop="countryId">
                 <el-select v-model="formData.data.countryId" placeholder="国家" filterable @change="(val) => getCityData(val, '20', true)">
                   <el-option v-for="item in countryData" :label="item.chineseName" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item prop="provinceName">
                 <selectCity
                   placeholder="省/洲"
@@ -55,7 +55,7 @@
                 </selectCity>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item prop="cityName">
                 <selectCity placeholder="城市" addressId="cityId" addressName="cityName" v-model="formData.data" :data="cityData"></selectCity>
               </el-form-item>
@@ -70,18 +70,18 @@
           </el-row>
         </template>
         <template #allAddressEnglish>
-          <el-row style="width: 100%">
-            <el-col :span="8">
+          <el-row style="width: 100%;display: flex;justify-content: space-between;">
+            <el-col :span="7">
               <el-form-item prop="countryEnStr">
                 <el-input v-model="formData.data.countryEnStr" placeholder="请输入国家 (英文)" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item prop="provinceEnStr">
                 <el-input v-model="formData.data.provinceEnStr" placeholder="请输入省/洲 (英文)" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="7">
               <el-form-item prop="cityEnStr">
                 <el-input v-model="formData.data.cityEnStr" placeholder="请输入城市 (英文)" />
               </el-form-item>

src/views/purchaseManage/purchaseManage/alreadyPurchase/index.vue

@@ -34,7 +34,7 @@
             style="cursor: pointer; color: #409eff"
             @click="handleClickcontractCode(item)"
           >
-            {{ item.code }}
+            {{ item.contractCode }}
           </div>
         </template>
       </byTable>
@@ -862,7 +862,7 @@ const handleClickcontractCode = (row) => {
   proxy.$router.push({
     name: "Contract",
     query: {
-      code: row.code,
+      code: row.contractCode,
     },
   });
 };

src/views/system/langConfig/index.vue

@@ -39,7 +39,7 @@
 				:formConfig="formConfig"
 				:formOption="formOption"
 				v-model="formData.data"
-				:rules="rules"
+				
 				ref="byform"
 			>
 			</byForm>
@@ -205,13 +205,14 @@ const submitData = ref('')
 const getList = async (req) => {
 	sourceList.value.pagination = { ...sourceList.value.pagination, ...req }
 	console.log(sourceList.value.pagination.type)
-	loading.value = false
+	loading.value = true
 	proxy
 		.get('/open/multilingual/getJson', {})
 		.then((message) => {
 			if (message.data) {
 				submitData.value = JSON.parse(message.data)
 				const res = JSON.parse(message.data)
+				console.log(res)
 				const tableData = getAllKeys(res.app.cn)
 				console.log(tableData)
 				//根据key获取res里其他语言的值
@@ -221,6 +222,7 @@ const getList = async (req) => {
 				}
 				sourceList.value.data = tableData
 			}
+			loading.value = false
 			// proxy.post('/open/multilingual/setJson',{configValue:JSON.stringify(res)}).then((message) => {
 			// })
 		})