Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2025-12-18 db8e73b120963810d6febdb939612db12d26996e

 ui/admin-ui3/src/views/tms/tmsArBill/index.vue

@@ -49,9 +49,14 @@
        <el-link size="small" type="primary" v-if="row.status != 2"
                 @click="handleJs(row)" class="link-btn" :underline="false"
                 icon="el-icon-tickets">结算
        </el-link><el-link size="small" type="primary"
        </el-link>
        <el-link size="small" type="primary"
                           @click="handleEdit(row)" class="link-btn" :underline="false"
                           icon="el-icon-edit">修改
      </el-link>
        <el-link size="small" type="primary"
                           @click="handleLog(row)" class="link-btn" :underline="false"
                           icon="el-icon-tickets">日志
      </el-link>
      </template>
    </avue-crud>
@@ -60,7 +65,7 @@

    <el-dialog :title="pageF.title" v-model="pageF.open" class="avue-dialog avue-dialog--top" width="80%">

      <avue-form  v-model="boxForm" ref="boxFormRef"
      <avue-form v-if="opt == 'js'"  v-model="boxForm" ref="boxFormRef"
                  :option="boxFormOption">

      </avue-form>
@@ -94,7 +99,22 @@
        </div>
      </template>
    </el-dialog>
    <el-dialog :title="pageF.title" v-model="open2" class="avue-dialog avue-dialog--top" width="80%">

      <avue-crud
          :option="logTableOption" ref="itemsTableRef2"
          :data="logTable"
      >

      </avue-crud>


    <template #footer>
      <div class="dialog-footer">
        <el-button @click="open2 = false">取 消</el-button>
      </div>
    </template>
    </el-dialog>


  </basicContainer>
@@ -115,7 +135,7 @@
import {PagesInterface, PageQueryInterface} from "@/utils/globalInterface";
import {usePagePlus} from "@/hooks/usePagePlus";
import {hasPermission} from "@/utils/permissionUtils";
import {addTmsArSettlement} from "@/api/tms/tmsArSettlement";
import {addTmsArSettlement, listTmsArSettlement} from "@/api/tms/tmsArSettlement";

const {proxy} = useCurrentInstance();
const crudRef = ref();
@@ -139,9 +159,10 @@
  },
  selectionList: [],
  opt: '',
  boxForm:<any> {}
  boxForm:<any> {},
  open2: false
})
const {queryParams, form, page, selectionList,opt,boxForm} = toRefs(data);
const {queryParams, form, page, selectionList,opt,boxForm,open2} = toRefs(data);
const option = ref({
  pageKey: 'TmsArBill',
  rowKey: 'id',
@@ -368,6 +389,44 @@
    }
  })
}
const logTableOption= ref({
  menu: false,
  add: false,
  header:false,
  selection: false,
  rowKey:'id',

  column:{

    settleAmount:{
      label: '结算金额',
    },
    createBy:{
      label: '处理人员',
    },
    attachment:{
      label: '附件下载',
      dataType: 'string',
      type: 'img'
    },

    remark:{
      label: '备注',
    },
    createTime:{
      label: '提交时间',
    },
  }
})
const logTable = ref<any>()

const handleLog = (row:any)=>{
  listTmsArSettlement({billId:row.id}).then(res=>{
    logTable.value =  res.rows||[];
    open2.value = true;
    pageF.title = '结算日志';
  })

}

</script>