cz 1 yıl önce
ebeveyn
işleme
2ab5a69c7c

+ 19 - 7
src/components/process/Contract.vue

@@ -1685,18 +1685,19 @@ const changeShroffAccount = (val) => {
     let data = accountList.value.filter((item) => item.value === val);
     console.log(formData.data.contractType);
     if (data && data.length > 0) {
-      if(formData.data.contractType == 2){
+      if (formData.data.contractType == 2) {
         formData.data.beneficiaryName = data[0].name;
         formData.data.beneficiaryBank = data[0].openingBank;
         formData.data.beneficiaryAccountNumber = data[0].accountOpening;
-        formData.data.beneficiaryBankAddress = '';
-        formData.data.swiftCode = '';
-        formData.data.beneficiaryAddress = '';
-      }else{
+        formData.data.beneficiaryBankAddress = "";
+        formData.data.swiftCode = "";
+        formData.data.beneficiaryAddress = "";
+      } else {
         formData.data.beneficiaryName = data[0].beneficiaryName;
         formData.data.beneficiaryBank = data[0].beneficiaryBank;
         formData.data.beneficiaryBankAddress = data[0].beneficiaryBankAddress;
-        formData.data.beneficiaryAccountNumber = data[0].beneficiaryAccountNumber;
+        formData.data.beneficiaryAccountNumber =
+          data[0].beneficiaryAccountNumber;
         formData.data.swiftCode = data[0].swiftCode;
         formData.data.beneficiaryAddress = data[0].beneficiaryAddress;
       }
@@ -1711,9 +1712,20 @@ watch(
       props.queryData &&
       ["10", "20", "30"].includes(route.query.processType)
     ) {
-      for (var text in props.queryData) {
+      for (let text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }
+      console.log(formData.data, "asda");
+      for (let i = 0; i < formData.data.contractProductList.length; i++) {
+        if (!formData.data.contractProductList[i].name) {
+          formData.data.contractProductList[i].name =
+            formData.data.contractProductList[i].productCnName;
+        }
+        if (!formData.data.contractProductList[i].code) {
+          formData.data.contractProductList[i].code =
+            formData.data.contractProductList[i].productCode;
+        }
+      }
       if (formData.data.countryId) {
         getCityData(formData.data.countryId, "20");
       }

+ 1 - 1
src/components/process/ContractAlteration.vue

@@ -1527,7 +1527,7 @@ watch(
   () => {
     formOption.disabled = judgeStatus();
     if (props.queryData && ["10", "20", "30"].includes(route.query.processType)) {
-      for (var text in props.queryData) {
+      for (let text in props.queryData) {
         formData.data[text] = props.queryData[text];
       }
       if (formData.data.countryId) {

+ 2 - 2
src/views/salesMange/saleContract/claim/index.vue

@@ -74,7 +74,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading"> 确 定 </el-button>
+        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading"> 确 定 </el-button>
       </template>
     </el-dialog>
 
@@ -415,7 +415,7 @@ const getDtl = (row) => {
       rate: row.rate,
       status: row.status + "",
       currency: row.currency,
-      waitAmount: Number(row.amount) - Number(res.data),
+      waitAmount: Math.round(Number(row.amount) - Number(res.data) * 100) / 100,
       accountManagementId: row.accountManagementId,
       accountManagementName: row.accountManagementName,
       claimTime: row.transactionTime,