Qukatie 6 дней назад
Родитель
Сommit
c213374235

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

@@ -95,7 +95,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">应付(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>
@@ -269,7 +269,7 @@ export default {
         stripe: true,
         align: "center",
         rowKey: "accBillId",
-        reserveSelection: true, // 翻页时,已选的行不丢失
+        // reserveSelection: true, // 翻页时,已选的行不丢失
         selection: true,
         showSummary: true,
         sumColumnList: [
@@ -791,6 +791,7 @@ export default {
             finstlbillsitemsRemove(arrIds.join(","))
               .then((res) => {
                 this.$message.success("删除成功");
+                this.$refs.crud.selectClear(); // 清空历史选中
                 this.$emit("update", this.form.id);
               })
               .finally(() => {

+ 3 - 3
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">应付(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>
@@ -169,7 +169,7 @@ export default {
         stripe: true,
         align: "center",
         rowKey: "accBillId",
-        reserveSelection: true, // 翻页时,已选的行不丢失
+        // reserveSelection: true, // 翻页时,已选的行不丢失
         selection: true,
         // highlightCurrentRow: true,
         column: [
@@ -679,7 +679,7 @@ export default {
       finstlbillslistAccBillV1(obj).then((res) => {
         res.data.data.forEach((item, index) => {
           item.accBillId = item.id;
-          delete item.id;
+          item.id=null;
           delete item.createUser;
           delete item.createUserName;
           delete item.createTime;

+ 14 - 1
src/views/iosBasicData/financialManagement/finstlbills/detailsPage.vue

@@ -840,9 +840,22 @@ export default {
         }
       }
       if (name == "重置条件") {
+        let obj = {
+          ...this.$options.data().form,
+          id: this.form.id,
+          version: this.form.version,
+          tenantId:this.form.tenantId,
+          branchId: this.form.branchId,
+          createUser: this.form.createUser,
+          createUserName: this.form.createUserName,
+          createTime: this.form.createTime,
+          updateUser: this.form.updateUser,
+          updateUserName: this.form.updateUserName,
+          updateTime: this.form.updateTime,
+        };
         await this.$refs.avueForm.resetForm();
         await this.$refs.avueForm2.resetForm();
-        this.form = this.$options.data().form;
+        this.form = obj;
       }
       if (name == "查看指示") {
         this.$refs.cashier.openDialog(this.form, this.form.finStlBillsItemsList, "view");