Qukatie 2 недель назад
Родитель
Сommit
30910cf39c

+ 2 - 2
src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -121,7 +121,7 @@
           placeholder="请输入 本次CNY"
           size="mini"
           style="width: 100%"
-          :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'CNY'"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </template>
@@ -134,7 +134,7 @@
           placeholder="请输入 本次USD"
           size="mini"
           style="width: 100%"
-          :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'USD'"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </template>

+ 8 - 8
src/views/iosBasicData/financialManagement/finstlbills/components/queryData.vue

@@ -22,7 +22,7 @@
         <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum || 0 }}</el-tag>
         <el-tag type="danger" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum || 0 }}</el-tag>
         <el-tag type="danger" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum || 0 }}</el-tag>
-        <el-tag type="danger" style="margin-right: 2px; color: #000000;margin-right: 50px;">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
+        <el-tag type="danger" style="margin-right: 2px; color: #000000; margin-right: 50px">应付(USD):{{ amountCSubUsdSum || 0 }}</el-tag>
         <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(CNY):{{ amountDSubSum2 || 0 }}</el-tag>
         <el-tag type="success" style="margin-right: 2px; color: #f56c6c">应收(USD):{{ amountDSubUsdSum2 || 0 }}</el-tag>
         <el-tag type="success" style="margin-right: 2px; color: #000000">应付(CNY):{{ amountCSubSum2 || 0 }}</el-tag>
@@ -40,7 +40,7 @@
           placeholder="请输入 本次CNY"
           size="mini"
           style="width: 100%"
-          :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'CNY' || (row.currentStlAmountRMB == 0 && row.reconciliationCurrentAmount == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountRMB }}</span>
       </template>
@@ -53,7 +53,7 @@
           placeholder="请输入 本次USD"
           size="mini"
           style="width: 100%"
-          :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountRMB == 0 && row.currentStlAmountUSD == 0)"
+          :disabled="row.currentStlCurCode != 'USD' || (row.currentStlAmountUSD == 0 && row.reconciliationCurrentAmount == 0)"
         ></el-input-number>
         <span v-else>{{ row.currentStlAmountUSD }}</span>
       </template>
@@ -426,7 +426,7 @@ export default {
       lastSelectedRow: null,
       lastSelectionRange: null, // {startIndex, endIndex}
       selectionList: [],
-      customselectList:[],
+      customselectList: [],
       isShiftPressed: false, // 键盘状态
       lastSelectedRowIndex: null,
       lastCustomSelectedRowIndex: null,
@@ -679,7 +679,7 @@ export default {
       finstlbillslistAccBillV1(obj).then((res) => {
         res.data.data.forEach((item, index) => {
           item.accBillId = item.id;
-          item.id=null;
+          item.id = null;
           delete item.createUser;
           delete item.createUserName;
           delete item.createTime;
@@ -689,11 +689,11 @@ export default {
           item.lineNo = Number(index) + 1;
           this.$set(item, "currentStlCurCode", item.curCode);
           this.$set(item, "currentStlExrate", item.exrate);
-          item.customSelected=false;
+          item.customSelected = false;
           item.accBillNo = item.billNo;
           item.billNo = item.businessBillDivideNo ? item.businessBillDivideNo : item.businessBillNo;
           item.dc = item.accountDc; // 收付
-          item.isSignfor =item.isSignFor;
+          item.isSignfor = item.isSignFor;
           // item.isChecked = 0;
           if (item.curCode == "CNY") {
             this.$set(item, "amountRMB", item.amount);
@@ -826,6 +826,6 @@ export default {
   color: #c0c4cc !important;
 }
 ::v-deep .el-table .selected-row td {
-  background-color: #E1F3D8 !important;
+  background-color: #e1f3d8 !important;
 }
 </style>